diff --git a/umap/static/umap/content.css b/umap/static/umap/content.css index f7b032e3..f1ebe99a 100644 --- a/umap/static/umap/content.css +++ b/umap/static/umap/content.css @@ -17,19 +17,19 @@ input:-moz-placeholder, :-moz-placeholder { color: #a5a5a5; } -#umap-ui-container textarea { +#umap-panel textarea { height: 100px; margin-bottom: 14px; } -#umap-ui-container select { +#umap-panel select { margin-bottom: 10px; } -#umap-ui-container.warning .button { +#umap-panel.warning .button { background-color: #c60f13; border: 1px solid #7f0a0c; } -#umap-ui-container.warning .button:hover { +#umap-panel.warning .button:hover { background-color: #970b0e; } @@ -194,7 +194,7 @@ h2.tabs a:hover { color: #efefef; text-decoration: underline; } -body.content #umap-ui-container { +body.content #umap-panel { background-color: #fff; } diff --git a/umap/static/umap/js/modules/browser.js b/umap/static/umap/js/modules/browser.js index a2230ad6..5e2d38ba 100644 --- a/umap/static/umap/js/modules/browser.js +++ b/umap/static/umap/js/modules/browser.js @@ -105,6 +105,7 @@ export default class Browser { DomEvent.on(toggle, 'click', toggleList) datalayer.renderToolbox(headline) const name = DomUtil.create('span', 'datalayer-name', headline) + name.textContent = datalayer.options.name DomEvent.on(name, 'click', toggleList) container.innerHTML = '' datalayer.eachFeature((feature) => this.addFeature(feature, container)) @@ -112,7 +113,9 @@ export default class Browser { let total = datalayer.count(), current = container.querySelectorAll('li').length, count = total == current ? total : `${current}/${total}` - name.textContent = `${datalayer.options.name} (${count})` + const counter = DomUtil.create('span', 'datalayer-counter', headline) + counter.textContent = `(${count})` + counter.title = translate(`Features in this layer: ${count}`) } onFormChange() { @@ -167,10 +170,23 @@ export default class Browser { this.map.eachBrowsableDataLayer((datalayer) => { this.addDataLayer(datalayer, dataContainer) }) + L.DomUtil.createButton( + 'show-on-edit block add-datalayer button', + container, + L._('Add a layer'), + this.newDataLayer, + this + ) // After datalayers have been added. const orderable = new Orderable(dataContainer, L.bind(this.onReorder, this)) } + newDataLayer () { + const datalayer = this.map.createDataLayer({}) + datalayer.edit() + } + + onReorder(src, dst, initialIndex, finalIndex) { const layer = this.map.datalayers[src.dataset.id], other = this.map.datalayers[dst.dataset.id], diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js index 04933087..52370364 100644 --- a/umap/static/umap/js/umap.controls.js +++ b/umap/static/umap/js/umap.controls.js @@ -501,7 +501,7 @@ U.DataLayersControl = L.Control.Button.extend({ options: { position: 'topright', className: 'umap-control-browse', - title: L._('Show datalayers'), + title: L._('See layers'), }, onClick: function () { diff --git a/umap/static/umap/locale/am_ET.js b/umap/static/umap/locale/am_ET.js index 1e4ac541..d485ad4d 100644 --- a/umap/static/umap/locale/am_ET.js +++ b/umap/static/umap/locale/am_ET.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "ሁሉንም ተመልከት", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "ሙሉውን ስክሪን ተመልከት", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/am_ET.json b/umap/static/umap/locale/am_ET.json index e6d37037..3471a9af 100644 --- a/umap/static/umap/locale/am_ET.json +++ b/umap/static/umap/locale/am_ET.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "ሁሉንም ተመልከት", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "ሙሉውን ስክሪን ተመልከት", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/ar.js b/umap/static/umap/locale/ar.js index 48dea06a..40a3cb1e 100644 --- a/umap/static/umap/locale/ar.js +++ b/umap/static/umap/locale/ar.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/ar.json b/umap/static/umap/locale/ar.json index 8aab7a9a..8fa1b0f0 100644 --- a/umap/static/umap/locale/ar.json +++ b/umap/static/umap/locale/ar.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/ast.js b/umap/static/umap/locale/ast.js index c699e893..d9d8696e 100644 --- a/umap/static/umap/locale/ast.js +++ b/umap/static/umap/locale/ast.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/ast.json b/umap/static/umap/locale/ast.json index f4ecf491..a56ffc3e 100644 --- a/umap/static/umap/locale/ast.json +++ b/umap/static/umap/locale/ast.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/bg.js b/umap/static/umap/locale/bg.js index ef1f2b04..f62c2032 100644 --- a/umap/static/umap/locale/bg.js +++ b/umap/static/umap/locale/bg.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "Виж на цял екран", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/bg.json b/umap/static/umap/locale/bg.json index 56b09a16..eea3e742 100644 --- a/umap/static/umap/locale/bg.json +++ b/umap/static/umap/locale/bg.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "Виж на цял екран", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/br.js b/umap/static/umap/locale/br.js index 7dd93668..4d63bb5a 100644 --- a/umap/static/umap/locale/br.js +++ b/umap/static/umap/locale/br.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Enrollañ al lec'h-mañ evel un elfenn nevez", "Search location": "Klask ul lec'h", "See all": "Gwelet pep tra", - "See data layers": "Diskouez ar gwiskadoù", + "See layers": "Diskouez ar gwiskadoù", "See full screen": "Gwelet e skramm a-bezh", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Diweredekaat evit kuzhat ar gwiskad-mañ ouzh an diaporama, ar merdeer roadennoù...", "Shape properties": "Perzhioù ar furm", diff --git a/umap/static/umap/locale/br.json b/umap/static/umap/locale/br.json index 7e882ebf..550c4908 100644 --- a/umap/static/umap/locale/br.json +++ b/umap/static/umap/locale/br.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Liamm aozañ kuzh eilet er golver!", "Secret edit link:": "Liamm aozañ kuzh:", "See all": "Gwelet pep tra", - "See data layers": "Diskouez ar gwiskadoù", + "See layers": "Diskouez ar gwiskadoù", "See full screen": "Gwelet e skramm a-bezh", "See on OpenStreetMap": "Gwelet war OpenStreetMap", "Select data": "Diuzañ ar roadennoù", diff --git a/umap/static/umap/locale/ca.js b/umap/static/umap/locale/ca.js index 5e9b4d40..07962d70 100644 --- a/umap/static/umap/locale/ca.js +++ b/umap/static/umap/locale/ca.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "Mostra les capes de dades", + "See layers": "Mostra les capes de dades", "See full screen": "Mostra-ho a pantalla completa", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/ca.json b/umap/static/umap/locale/ca.json index b9a32777..5c826dfd 100644 --- a/umap/static/umap/locale/ca.json +++ b/umap/static/umap/locale/ca.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "L'enllaç secret s'ha copiat al porta-retalls!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "Mostra les capes de dades", + "See layers": "Mostra les capes de dades", "See full screen": "Mostra-ho a pantalla completa", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/cs_CZ.js b/umap/static/umap/locale/cs_CZ.js index 9edef54d..9a52a7ed 100644 --- a/umap/static/umap/locale/cs_CZ.js +++ b/umap/static/umap/locale/cs_CZ.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Uložit tuto pozici jako nový objekt", "Search location": "Vyhledat místo na mapě", "See all": "Zobraz vše", - "See data layers": "Zobrazit datové vrstvy", + "See layers": "Zobrazit datové vrstvy", "See full screen": "Na celou obrazovku", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Nastavte na false pro ukrytí této vrstvy z prezentace, prohlížeče dat, vyskakovací navigace...", "Shape properties": "Vlastností tvaru", diff --git a/umap/static/umap/locale/cs_CZ.json b/umap/static/umap/locale/cs_CZ.json index 9a6319af..9bcab004 100644 --- a/umap/static/umap/locale/cs_CZ.json +++ b/umap/static/umap/locale/cs_CZ.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Tajný odkaz na úpravy do schránky!", "Secret edit link:": "Tajný odkaz na úpravy:", "See all": "Zobraz vše", - "See data layers": "Zobrazit datové vrstvy", + "See layers": "Zobrazit datové vrstvy", "See full screen": "Na celou obrazovku", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/da.js b/umap/static/umap/locale/da.js index e100b104..ecb7e897 100644 --- a/umap/static/umap/locale/da.js +++ b/umap/static/umap/locale/da.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Gem denne placering som et nyt objekt", "Search location": "Søg efter placering", "See all": "Se alle", - "See data layers": "Se datalag", + "See layers": "Se datalag", "See full screen": "Se i fuld skærm", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Sæt den til false, for at skjule dette lag fra slideshowet, databrowseren, popupnavigeringen…", "Shape properties": "Figuregenskaber", diff --git a/umap/static/umap/locale/da.json b/umap/static/umap/locale/da.json index 50bb257b..6447d0ab 100644 --- a/umap/static/umap/locale/da.json +++ b/umap/static/umap/locale/da.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Se alle", - "See data layers": "Se datalag", + "See layers": "Se datalag", "See full screen": "Se i fuld skærm", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/de.js b/umap/static/umap/locale/de.js index 563e1c28..35e738c8 100644 --- a/umap/static/umap/locale/de.js +++ b/umap/static/umap/locale/de.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Diesen Ort als neues Element speichern", "Search location": "Ort suchen", "See all": "Alle anzeigen", - "See data layers": "Datenebenen ansehen", + "See layers": "Datenebenen ansehen", "See full screen": "Vollbildanzeige", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Setze es auf Nein, um diese Ebene in der Diashow, im Datenbrowser, in der Popup-Navigation,... auszublenden.", "Shape properties": "Formeigenschaften", diff --git a/umap/static/umap/locale/de.json b/umap/static/umap/locale/de.json index ffe8e431..73dceb87 100644 --- a/umap/static/umap/locale/de.json +++ b/umap/static/umap/locale/de.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Geheimer Link zum Bearbeiten der Karte in die Zwischenablage kopiert!", "Secret edit link:": "Secret edit link:", "See all": "Alle anzeigen", - "See data layers": "Datenebenen ansehen", + "See layers": "Datenebenen ansehen", "See full screen": "Vollbildanzeige", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Wähle Daten aus", diff --git a/umap/static/umap/locale/el.js b/umap/static/umap/locale/el.js index 229adedc..c5f584a0 100644 --- a/umap/static/umap/locale/el.js +++ b/umap/static/umap/locale/el.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Αποθήκευση αυτής της τοποθεσίας ως νέο στοιχείο", "Search location": "Αναζήτηση τοποθεσίας", "See all": "Εμφάνιση όλων", - "See data layers": "Εμφάνιση επιπέδων δεδομένων", + "See layers": "Εμφάνιση επιπέδων δεδομένων", "See full screen": "Εμφάνιση πλήρους οθόνης", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Απενεργοποίηση εάν επιθυμείτε την απόκρυψη του επιπέδου κατά την προβολή των διαφανειών, την περιήγηση δεδομένων, την αναδυόμενη πλοήγηση...", "Shape properties": "Ιδιότητες σχήματος", diff --git a/umap/static/umap/locale/el.json b/umap/static/umap/locale/el.json index ccb7b510..6187b312 100644 --- a/umap/static/umap/locale/el.json +++ b/umap/static/umap/locale/el.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Ο μυστικός σύνδεσμος επεξεργασίας αντιγράφηκε στο πρόχειρο!", "Secret edit link:": "Μυστικός σύνδεσμος επεξεργασίας:", "See all": "Εμφάνιση όλων", - "See data layers": "Εμφάνιση επιπέδων δεδομένων", + "See layers": "Εμφάνιση επιπέδων δεδομένων", "See full screen": "Εμφάνιση πλήρους οθόνης", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Επιλογή δεδομένων", diff --git a/umap/static/umap/locale/en.js b/umap/static/umap/locale/en.js index 12f0550e..9a733eba 100644 --- a/umap/static/umap/locale/en.js +++ b/umap/static/umap/locale/en.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/en.json b/umap/static/umap/locale/en.json index 0408bfda..887f80f0 100644 --- a/umap/static/umap/locale/en.json +++ b/umap/static/umap/locale/en.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/en_US.json b/umap/static/umap/locale/en_US.json index 791f4d62..325760c0 100644 --- a/umap/static/umap/locale/en_US.json +++ b/umap/static/umap/locale/en_US.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/es.js b/umap/static/umap/locale/es.js index 59bb67f1..4146e929 100644 --- a/umap/static/umap/locale/es.js +++ b/umap/static/umap/locale/es.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Guardar esta ubicación como nuevo elemento", "Search location": "Buscar ubicación", "See all": "Ver todo", - "See data layers": "Ver capas de datos", + "See layers": "Ver capas de datos", "See full screen": "Ver pantalla completa", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Establecer en falso para ocultar esta capa de la presentación de diapositivas, el navegador de datos, la navegación emergente...", "Shape properties": "Propiedades de la figura", diff --git a/umap/static/umap/locale/es.json b/umap/static/umap/locale/es.json index 13d6c661..0fd3cfb5 100644 --- a/umap/static/umap/locale/es.json +++ b/umap/static/umap/locale/es.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Enlace de edición secreto copiado en el portapapeles", "Secret edit link:": "Enlace secreto de edición:", "See all": "Ver todo", - "See data layers": "Ver capas de datos", + "See layers": "Ver capas de datos", "See full screen": "Ver pantalla completa", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/et.js b/umap/static/umap/locale/et.js index d203ca25..049c5035 100644 --- a/umap/static/umap/locale/et.js +++ b/umap/static/umap/locale/et.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Salvesta see asukoht uue elemendina", "Search location": "Asukoha otsing", "See all": "Näita kõiki", - "See data layers": "Näita andmekihte", + "See layers": "Näita andmekihte", "See full screen": "Täisekraanvaade", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Kujundi omadused", diff --git a/umap/static/umap/locale/et.json b/umap/static/umap/locale/et.json index 506e259b..c4d5c43a 100644 --- a/umap/static/umap/locale/et.json +++ b/umap/static/umap/locale/et.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Näita kõiki", - "See data layers": "Näita andmekihte", + "See layers": "Näita andmekihte", "See full screen": "Täisekraanvaade", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/eu.js b/umap/static/umap/locale/eu.js index 181f875b..53af4d7d 100644 --- a/umap/static/umap/locale/eu.js +++ b/umap/static/umap/locale/eu.js @@ -250,7 +250,7 @@ const locale = { "Search location": "Search location", "Secret edit link is:
{link}": "Secret edit link is:
{link}", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/eu.json b/umap/static/umap/locale/eu.json index d7249e9c..6e23663f 100644 --- a/umap/static/umap/locale/eu.json +++ b/umap/static/umap/locale/eu.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/fa_IR.js b/umap/static/umap/locale/fa_IR.js index 523b9629..cd439757 100644 --- a/umap/static/umap/locale/fa_IR.js +++ b/umap/static/umap/locale/fa_IR.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "این مکان را به عنوان ویژگی جدید ذخیره کنید", "Search location": "مکان را جستجو کنید", "See all": "همه را ببین", - "See data layers": "لایه های داده را مشاهده کنید", + "See layers": "لایه های داده را مشاهده کنید", "See full screen": "تمام صفحه را مشاهده کنید", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "آن را روی غلط/false تنظیم کنید تا این لایه از نمایش اسلاید، مرورگر داده، ناوبری بازشو پنهان شود…", "Shape properties": "ویژگی های شکل", diff --git a/umap/static/umap/locale/fa_IR.json b/umap/static/umap/locale/fa_IR.json index 8349127e..34ba25f5 100644 --- a/umap/static/umap/locale/fa_IR.json +++ b/umap/static/umap/locale/fa_IR.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "همه را ببین", - "See data layers": "لایه های داده را مشاهده کنید", + "See layers": "لایه های داده را مشاهده کنید", "See full screen": "تمام صفحه را مشاهده کنید", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "داده‌ها را انتخاب کنید", diff --git a/umap/static/umap/locale/fi.js b/umap/static/umap/locale/fi.js index 5e32675f..65097279 100644 --- a/umap/static/umap/locale/fi.js +++ b/umap/static/umap/locale/fi.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "Näytä kaikki", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "Katso koko näytöllä", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Piirteen ominaisuudet", diff --git a/umap/static/umap/locale/fi.json b/umap/static/umap/locale/fi.json index de07f287..04201181 100644 --- a/umap/static/umap/locale/fi.json +++ b/umap/static/umap/locale/fi.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Näytä kaikki", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "Katso koko näytöllä", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/fr.js b/umap/static/umap/locale/fr.js index 5e982bf0..8e417048 100644 --- a/umap/static/umap/locale/fr.js +++ b/umap/static/umap/locale/fr.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Enregistrer ce lieu comme élément de la carte", "Search location": "Chercher un lieu", "See all": "Tout voir", - "See data layers": "Voir les calques", + "See layers": "Voir les calques", "See full screen": "Voir en plein écran", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Désactiver pour masquer ce calque du diaporama, du navigateur de données…", "Shape properties": "Propriétés de la forme", diff --git a/umap/static/umap/locale/fr.json b/umap/static/umap/locale/fr.json index f81f84d6..7cc4f476 100644 --- a/umap/static/umap/locale/fr.json +++ b/umap/static/umap/locale/fr.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Lien d'édition secret copié dans le presse-papier!", "Secret edit link:": "Lien d'édition secret :", "See all": "Tout voir", - "See data layers": "Voir les calques", + "See layers": "Voir les calques", "See full screen": "Voir en plein écran", "See on OpenStreetMap": "Voir sur OpenStreetMap", "Select data": "Sélectionner les données", diff --git a/umap/static/umap/locale/gl.js b/umap/static/umap/locale/gl.js index 8768547e..0d50af20 100644 --- a/umap/static/umap/locale/gl.js +++ b/umap/static/umap/locale/gl.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Gardar esta ubicación coma novo elemento", "Search location": "Procurar localización", "See all": "Ollar todo", - "See data layers": "Ollar capas de datos", + "See layers": "Ollar capas de datos", "See full screen": "Ollar pantalla completa", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Axústeo a falso para agochar esta capa da presentación ('slideshow'), o navegador de datos, a navegación da xanela emerxente...", "Shape properties": "Propiedades da forma", diff --git a/umap/static/umap/locale/gl.json b/umap/static/umap/locale/gl.json index b2131706..26ab558c 100644 --- a/umap/static/umap/locale/gl.json +++ b/umap/static/umap/locale/gl.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Ollar todo", - "See data layers": "Ollar capas de datos", + "See layers": "Ollar capas de datos", "See full screen": "Ollar pantalla completa", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/he.js b/umap/static/umap/locale/he.js index a1342212..2b7e5f28 100644 --- a/umap/static/umap/locale/he.js +++ b/umap/static/umap/locale/he.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "לשמור את המיקום הזה כתכונה חדשה", "Search location": "חיפוש מיקום", "See all": "להציג הכול", - "See data layers": "להציג שכבות נתונים", + "See layers": "להציג שכבות נתונים", "See full screen": "הצגת מסך מלא", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "יש להגדיר לשקר כדי להסתיר את השכבה הזאת מהמצגת, דפדפן הנתונים, הניווט המוקפץ…", "Shape properties": "מאפייני צורה", diff --git a/umap/static/umap/locale/he.json b/umap/static/umap/locale/he.json index 1b73c8d1..65cf7b27 100644 --- a/umap/static/umap/locale/he.json +++ b/umap/static/umap/locale/he.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "להציג הכול", - "See data layers": "להציג שכבות נתונים", + "See layers": "להציג שכבות נתונים", "See full screen": "הצגת מסך מלא", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/hr.js b/umap/static/umap/locale/hr.js index e9c21345..60397c5f 100644 --- a/umap/static/umap/locale/hr.js +++ b/umap/static/umap/locale/hr.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "Prikaži unesene podatke", + "See layers": "Prikaži unesene podatke", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/hr.json b/umap/static/umap/locale/hr.json index 0848beeb..132f1762 100644 --- a/umap/static/umap/locale/hr.json +++ b/umap/static/umap/locale/hr.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "Prikaži unesene podatke", + "See layers": "Prikaži unesene podatke", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/hu.js b/umap/static/umap/locale/hu.js index ac1dc189..1455c457 100644 --- a/umap/static/umap/locale/hu.js +++ b/umap/static/umap/locale/hu.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "E hely mentése új objektumként", "Search location": "Hely keresése", "See all": "Összes megtekintése", - "See data layers": "Adatrétegek megtekintése", + "See layers": "Adatrétegek megtekintése", "See full screen": "Teljes képernyős nézet megtekintése", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Állítsa hamisra, hogy elrejtse ezt a réteget a diavetítésből, az adatböngészőből, az előugró navigációból stb.", "Shape properties": "Alakzat tulajdonságai", diff --git a/umap/static/umap/locale/hu.json b/umap/static/umap/locale/hu.json index fa4e9175..5e9cc04f 100644 --- a/umap/static/umap/locale/hu.json +++ b/umap/static/umap/locale/hu.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Titkos szerkesztési link a vágólapra másolva.", "Secret edit link:": "Titkos szerkesztési link:", "See all": "Összes megtekintése", - "See data layers": "Adatrétegek megtekintése", + "See layers": "Adatrétegek megtekintése", "See full screen": "Teljes képernyős nézet megtekintése", "See on OpenStreetMap": "Megtekintés az OpenStreetMapen", "Select data": "Select data", diff --git a/umap/static/umap/locale/id.js b/umap/static/umap/locale/id.js index d0afe1b2..aa41140b 100644 --- a/umap/static/umap/locale/id.js +++ b/umap/static/umap/locale/id.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/id.json b/umap/static/umap/locale/id.json index f4ecf491..a56ffc3e 100644 --- a/umap/static/umap/locale/id.json +++ b/umap/static/umap/locale/id.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/is.js b/umap/static/umap/locale/is.js index 5cd7c287..fd048107 100644 --- a/umap/static/umap/locale/is.js +++ b/umap/static/umap/locale/is.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Vista þessa staðsetningu sem nýja fitju", "Search location": "Leita að staðsetningu", "See all": "Sjá allt", - "See data layers": "Skoða gagnalög", + "See layers": "Skoða gagnalög", "See full screen": "Fylla skjáinn", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Settu þetta sem ósatt til að fela þetta lag úr skyggnusýningu, gagnavafranum, sprettleiðsögn…", "Shape properties": "Eiginleikar lögunar", diff --git a/umap/static/umap/locale/is.json b/umap/static/umap/locale/is.json index 7e450fdc..16fe4f8b 100644 --- a/umap/static/umap/locale/is.json +++ b/umap/static/umap/locale/is.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Sjá allt", - "See data layers": "Skoða gagnalög", + "See layers": "Skoða gagnalög", "See full screen": "Fylla skjáinn", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/it.js b/umap/static/umap/locale/it.js index b5c412ca..241aee5c 100644 --- a/umap/static/umap/locale/it.js +++ b/umap/static/umap/locale/it.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Salva questa posizione come nuovo oggetto", "Search location": "Cerca un luogo", "See all": "Vedi tutto", - "See data layers": "Vedi i layer di dati", + "See layers": "Vedi i layer di dati", "See full screen": "Visualizza a schermo intero", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Impostalo su false per nascondere questo layer dalla presentazione, dal browser dati, dalla navigazione popup...", "Shape properties": "Proprietà della geometria", diff --git a/umap/static/umap/locale/it.json b/umap/static/umap/locale/it.json index 23ba696d..02ead191 100644 --- a/umap/static/umap/locale/it.json +++ b/umap/static/umap/locale/it.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Link della modifica segreta copiato in memoria!", "Secret edit link:": "Link segreto per editare:", "See all": "Vedi tutto", - "See data layers": "Vedi i layer di dati", + "See layers": "Vedi i layer di dati", "See full screen": "Visualizza a schermo intero", "See on OpenStreetMap": "Vedi su OpenStreetMap", "Select data": "Seleziona i dati", diff --git a/umap/static/umap/locale/ja.js b/umap/static/umap/locale/ja.js index d5315762..de7029ba 100644 --- a/umap/static/umap/locale/ja.js +++ b/umap/static/umap/locale/ja.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "この場所を新しい地物として保存", "Search location": "地名で検索", "See all": "すべて表示", - "See data layers": "データレイヤを見る", + "See layers": "データレイヤを見る", "See full screen": "フルスクリーン表示", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "シェイプ表示プロパティ", diff --git a/umap/static/umap/locale/ja.json b/umap/static/umap/locale/ja.json index 8c51c6f5..a4d191ce 100644 --- a/umap/static/umap/locale/ja.json +++ b/umap/static/umap/locale/ja.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "すべて表示", - "See data layers": "データレイヤを見る", + "See layers": "データレイヤを見る", "See full screen": "フルスクリーン表示", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/ko.js b/umap/static/umap/locale/ko.js index 27daa6e9..e0205c98 100644 --- a/umap/static/umap/locale/ko.js +++ b/umap/static/umap/locale/ko.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/ko.json b/umap/static/umap/locale/ko.json index 7d9560be..9d54844e 100644 --- a/umap/static/umap/locale/ko.json +++ b/umap/static/umap/locale/ko.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/lt.js b/umap/static/umap/locale/lt.js index b0c1598a..f7cd4ffb 100644 --- a/umap/static/umap/locale/lt.js +++ b/umap/static/umap/locale/lt.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "Išsaugoti viską", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "Peržiūrėti per visą ekraną", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/lt.json b/umap/static/umap/locale/lt.json index 1cc773fb..72b42502 100644 --- a/umap/static/umap/locale/lt.json +++ b/umap/static/umap/locale/lt.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Išsaugoti viską", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "Peržiūrėti per visą ekraną", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/ms.js b/umap/static/umap/locale/ms.js index 016003b5..275b5d37 100644 --- a/umap/static/umap/locale/ms.js +++ b/umap/static/umap/locale/ms.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Simpan kedudukan ini sebagai sifat baharu", "Search location": "Kedudukan carian", "See all": "Lihat semua", - "See data layers": "Lihat lapisan data", + "See layers": "Lihat lapisan data", "See full screen": "Lihat skrin penuh", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Tetapkan ke 'false' untuk menyembunyikan lapisan ini daripada persembahan slaid, pelayar data, navigasi timbul…", "Shape properties": "Ciri-ciri bentuk", diff --git a/umap/static/umap/locale/ms.json b/umap/static/umap/locale/ms.json index 9862de03..76452778 100644 --- a/umap/static/umap/locale/ms.json +++ b/umap/static/umap/locale/ms.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Pautan suntingan rahsia telah disalin ke papan keratan!", "Secret edit link:": "Pautan suntingan rahsia:", "See all": "Lihat semua", - "See data layers": "Lihat lapisan data", + "See layers": "Lihat lapisan data", "See full screen": "Lihat skrin penuh", "See on OpenStreetMap": "Lihat di OpenStreetMap", "Select data": "Pilih data", diff --git a/umap/static/umap/locale/nl.js b/umap/static/umap/locale/nl.js index a4f90caa..c106c4c7 100644 --- a/umap/static/umap/locale/nl.js +++ b/umap/static/umap/locale/nl.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Sla deze locatie op als nieuw object", "Search location": "Zoek locatie", "See all": "Toon alles", - "See data layers": "Bekijk datalagen", + "See layers": "Bekijk datalagen", "See full screen": "Op volledig scherm weergeven", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Zet op onwaar ('false') om deze laag te verbergen in de slideshow, data verkenner, popup navigatie, ...", "Shape properties": "Eigenschappen van de vorm", diff --git a/umap/static/umap/locale/nl.json b/umap/static/umap/locale/nl.json index f7c907e6..1ee3e247 100644 --- a/umap/static/umap/locale/nl.json +++ b/umap/static/umap/locale/nl.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Geheime editeer-link is gekopieerd naar het klembord!", "Secret edit link:": "Geheime editeer-link", "See all": "Toon alles", - "See data layers": "Bekijk datalagen", + "See layers": "Bekijk datalagen", "See full screen": "Op volledig scherm weergeven", "See on OpenStreetMap": "Bekijk op OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/no.js b/umap/static/umap/locale/no.js index 97580d49..d77fc4c5 100644 --- a/umap/static/umap/locale/no.js +++ b/umap/static/umap/locale/no.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/no.json b/umap/static/umap/locale/no.json index a29e9870..c5a949d0 100644 --- a/umap/static/umap/locale/no.json +++ b/umap/static/umap/locale/no.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/pl.js b/umap/static/umap/locale/pl.js index 3bf808d6..ace9d589 100644 --- a/umap/static/umap/locale/pl.js +++ b/umap/static/umap/locale/pl.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Zapisz to miejsce jako nowy obiekt", "Search location": "Znajdź miejsce", "See all": "Pokaż wszystko", - "See data layers": "Zobacz wszystkie warstwy danych", + "See layers": "Zobacz wszystkie warstwy danych", "See full screen": "Pełny ekran", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Ustaw „OFF”, żeby ukryć tę warstwę z pokazu slajdów, przeglądarki danych i okienek nawigacji.", "Shape properties": "Właściwości kształtu", diff --git a/umap/static/umap/locale/pl.json b/umap/static/umap/locale/pl.json index 102348ae..89963c08 100644 --- a/umap/static/umap/locale/pl.json +++ b/umap/static/umap/locale/pl.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Tajny odnośnik do edycji skopiowany do schowka!", "Secret edit link:": "Sekretny odnośnik edycji:", "See all": "Pokaż wszystko", - "See data layers": "Zobacz wszystkie warstwy danych", + "See layers": "Zobacz wszystkie warstwy danych", "See full screen": "Pełny ekran", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/pl_PL.json b/umap/static/umap/locale/pl_PL.json index f4ecf491..a56ffc3e 100644 --- a/umap/static/umap/locale/pl_PL.json +++ b/umap/static/umap/locale/pl_PL.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/pt.js b/umap/static/umap/locale/pt.js index d19039f7..7336be93 100644 --- a/umap/static/umap/locale/pt.js +++ b/umap/static/umap/locale/pt.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Gravar esta localização como novo elemento", "Search location": "Procurar localização", "See all": "Ver tudo", - "See data layers": "Ver camadas de dados", + "See layers": "Ver camadas de dados", "See full screen": "Ver em ecrã total", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Defina como falso para ocultar esta camada da apresentação de slides, o navegador de dados e da navegação do popup…", "Shape properties": "Propriedades de formas geométricas", diff --git a/umap/static/umap/locale/pt.json b/umap/static/umap/locale/pt.json index 9acabd19..afabf49b 100644 --- a/umap/static/umap/locale/pt.json +++ b/umap/static/umap/locale/pt.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Ver tudo", - "See data layers": "Ver camadas de dados", + "See layers": "Ver camadas de dados", "See full screen": "Ver em ecrã total", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/pt_BR.js b/umap/static/umap/locale/pt_BR.js index 74a2d201..b135758c 100644 --- a/umap/static/umap/locale/pt_BR.js +++ b/umap/static/umap/locale/pt_BR.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Gravar esta localização como novo elemento", "Search location": "Procurar localização", "See all": "Ver tudo", - "See data layers": "Ver camadas de dados", + "See layers": "Ver camadas de dados", "See full screen": "Ver em ecrã total", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Defina como falso para ocultar esta camada da apresentação de slides, o navegador de dados e da navegação do popup…", "Shape properties": "Propriedades de formas geométricas", diff --git a/umap/static/umap/locale/pt_BR.json b/umap/static/umap/locale/pt_BR.json index b2946e84..54dcb9dd 100644 --- a/umap/static/umap/locale/pt_BR.json +++ b/umap/static/umap/locale/pt_BR.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Ver tudo", - "See data layers": "Ver camadas de dados", + "See layers": "Ver camadas de dados", "See full screen": "Ver em ecrã total", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/pt_PT.js b/umap/static/umap/locale/pt_PT.js index 550b49f1..e5ec7c09 100644 --- a/umap/static/umap/locale/pt_PT.js +++ b/umap/static/umap/locale/pt_PT.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Gravar esta localização como novo elemento", "Search location": "Procurar localização", "See all": "Ver tudo", - "See data layers": "Ver camadas de dados", + "See layers": "Ver camadas de dados", "See full screen": "Ver em ecrã total", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Defina como falso para ocultar esta camada da apresentação de slides, o navegador de dados e da navegação do popup…", "Shape properties": "Propriedades de formas geométricas", diff --git a/umap/static/umap/locale/pt_PT.json b/umap/static/umap/locale/pt_PT.json index 6657b780..79e8441c 100644 --- a/umap/static/umap/locale/pt_PT.json +++ b/umap/static/umap/locale/pt_PT.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Ver tudo", - "See data layers": "Ver camadas de dados", + "See layers": "Ver camadas de dados", "See full screen": "Ver em ecrã total", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/ro.js b/umap/static/umap/locale/ro.js index b509ed07..dc111e1d 100644 --- a/umap/static/umap/locale/ro.js +++ b/umap/static/umap/locale/ro.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Căutați locația", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/ro.json b/umap/static/umap/locale/ro.json index 11214613..f41ea864 100644 --- a/umap/static/umap/locale/ro.json +++ b/umap/static/umap/locale/ro.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/ru.js b/umap/static/umap/locale/ru.js index 0de09d4c..22308a35 100644 --- a/umap/static/umap/locale/ru.js +++ b/umap/static/umap/locale/ru.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Сохранить это местоположение как новый объект", "Search location": "Поиск местоположения", "See all": "Посмотреть все", - "See data layers": "Посмотреть слои данных", + "See layers": "Посмотреть слои данных", "See full screen": "Смотреть в полноэкранном режиме", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Сбросьте, чтобы скрыть слой из слайдшоу, просмотра данных и всплывающей навигации...", "Shape properties": "Свойства фигуры", diff --git a/umap/static/umap/locale/ru.json b/umap/static/umap/locale/ru.json index 1907527c..83a9acc7 100644 --- a/umap/static/umap/locale/ru.json +++ b/umap/static/umap/locale/ru.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Посмотреть все", - "See data layers": "Посмотреть слои данных", + "See layers": "Посмотреть слои данных", "See full screen": "Смотреть в полноэкранном режиме", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/si.js b/umap/static/umap/locale/si.js index 2cad7095..30f7de11 100644 --- a/umap/static/umap/locale/si.js +++ b/umap/static/umap/locale/si.js @@ -244,7 +244,7 @@ const locale = { "Search a place name": "Search a place name", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/si.json b/umap/static/umap/locale/si.json index 4d166927..2c71f08a 100644 --- a/umap/static/umap/locale/si.json +++ b/umap/static/umap/locale/si.json @@ -244,7 +244,7 @@ "Search a place name": "Search a place name", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/sk_SK.js b/umap/static/umap/locale/sk_SK.js index e397d132..1cf13978 100644 --- a/umap/static/umap/locale/sk_SK.js +++ b/umap/static/umap/locale/sk_SK.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Uložiť túto polohu ako nový objekt", "Search location": "Vyhľadať polohu", "See all": "Zobraziť všetko", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "Na celú obrazovku", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Vlastnosti tvaru", diff --git a/umap/static/umap/locale/sk_SK.json b/umap/static/umap/locale/sk_SK.json index 65be3387..2b61f0ba 100644 --- a/umap/static/umap/locale/sk_SK.json +++ b/umap/static/umap/locale/sk_SK.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Zobraziť všetko", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "Na celú obrazovku", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/sl.js b/umap/static/umap/locale/sl.js index 969a5eb6..d8a66709 100644 --- a/umap/static/umap/locale/sl.js +++ b/umap/static/umap/locale/sl.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Shrani mesto kot nov predmet", "Search location": "Preišči mesto", "See all": "Pokaži vse", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "Pokaži v celozaslonskem načinu", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Neizbrana možnost skrije plast med predstavitvijo, v pregledovalniku podatkov, ...", "Shape properties": "Lastnosti oblike", diff --git a/umap/static/umap/locale/sl.json b/umap/static/umap/locale/sl.json index d4292a19..d656c296 100644 --- a/umap/static/umap/locale/sl.json +++ b/umap/static/umap/locale/sl.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Pokaži vse", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "Pokaži v celozaslonskem načinu", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/sr.js b/umap/static/umap/locale/sr.js index 0164bd5b..94f22696 100644 --- a/umap/static/umap/locale/sr.js +++ b/umap/static/umap/locale/sr.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Сачувај локацију као нови елемент", "Search location": "Претражи локацију", "See all": "Види све", - "See data layers": "Прикажи унесене податке", + "See layers": "Прикажи унесене податке", "See full screen": "Увећана слика", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Својства облика", diff --git a/umap/static/umap/locale/sr.json b/umap/static/umap/locale/sr.json index 7d48ddc7..15597ee7 100644 --- a/umap/static/umap/locale/sr.json +++ b/umap/static/umap/locale/sr.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Види све", - "See data layers": "Прикажи унесене податке", + "See layers": "Прикажи унесене податке", "See full screen": "Увећана слика", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/sv.js b/umap/static/umap/locale/sv.js index 3e3589ab..cc0bac97 100644 --- a/umap/static/umap/locale/sv.js +++ b/umap/static/umap/locale/sv.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Spara denna plats som nytt kartobjekt", "Search location": "Sök plats", "See all": "Se alla", - "See data layers": "Visa datalager", + "See layers": "Visa datalager", "See full screen": "Öppna i fullskärm", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Slå av för att dölja lagret från bilspelsvisning, databläddrare, popup-navigering etc", "Shape properties": "Formategenskaper", diff --git a/umap/static/umap/locale/sv.json b/umap/static/umap/locale/sv.json index 5d8b2727..d347f9be 100644 --- a/umap/static/umap/locale/sv.json +++ b/umap/static/umap/locale/sv.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Hemlig redigeringslänk kopierad till klippbordet", "Secret edit link:": "Secret edit link:", "See all": "Se alla", - "See data layers": "Visa datalager", + "See layers": "Visa datalager", "See full screen": "Öppna i fullskärm", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/th_TH.js b/umap/static/umap/locale/th_TH.js index 65caf03d..31da42e8 100644 --- a/umap/static/umap/locale/th_TH.js +++ b/umap/static/umap/locale/th_TH.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/th_TH.json b/umap/static/umap/locale/th_TH.json index f4ecf491..a56ffc3e 100644 --- a/umap/static/umap/locale/th_TH.json +++ b/umap/static/umap/locale/th_TH.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/tr.js b/umap/static/umap/locale/tr.js index 520c314e..b57b24b8 100644 --- a/umap/static/umap/locale/tr.js +++ b/umap/static/umap/locale/tr.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Bu konumu yeni özellik olarak kaydet", "Search location": "Konum ara", "See all": "Hepsini gör", - "See data layers": "Veri katmanlarını gör", + "See layers": "Veri katmanlarını gör", "See full screen": "Tam ekranda gör", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Bu katmanı slayt gösterisinden, veri tarayıcısından, pop-up gezinmeden gizlemek için yanlış olarak ayarlayın ...", "Shape properties": "Şekil özellikleri", diff --git a/umap/static/umap/locale/tr.json b/umap/static/umap/locale/tr.json index 2d9ce685..009c96d2 100644 --- a/umap/static/umap/locale/tr.json +++ b/umap/static/umap/locale/tr.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Hepsini gör", - "See data layers": "Veri katmanlarını gör", + "See layers": "Veri katmanlarını gör", "See full screen": "Tam ekranda gör", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/uk_UA.js b/umap/static/umap/locale/uk_UA.js index d6333823..3e4ab0e4 100644 --- a/umap/static/umap/locale/uk_UA.js +++ b/umap/static/umap/locale/uk_UA.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Зберегти місце розташування як новий об’єкт", "Search location": "Пошук місця", "See all": "Переглянути усе", - "See data layers": "Подивитися шари даних", + "See layers": "Подивитися шари даних", "See full screen": "Дивитися в повноекранному режимі", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Встановіть false, щоб приховати шар в слайдшоу, в перегляді даних та навігації…", "Shape properties": "Параметри полігона", diff --git a/umap/static/umap/locale/uk_UA.json b/umap/static/umap/locale/uk_UA.json index aabca3e7..2d4a9308 100644 --- a/umap/static/umap/locale/uk_UA.json +++ b/umap/static/umap/locale/uk_UA.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "Переглянути усе", - "See data layers": "Подивитися шари даних", + "See layers": "Подивитися шари даних", "See full screen": "Дивитися в повноекранному режимі", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/vi.js b/umap/static/umap/locale/vi.js index 9b9a900d..ee56a392 100644 --- a/umap/static/umap/locale/vi.js +++ b/umap/static/umap/locale/vi.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/vi.json b/umap/static/umap/locale/vi.json index 20415efb..6c95ff9f 100644 --- a/umap/static/umap/locale/vi.json +++ b/umap/static/umap/locale/vi.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/vi_VN.json b/umap/static/umap/locale/vi_VN.json index f4ecf491..a56ffc3e 100644 --- a/umap/static/umap/locale/vi_VN.json +++ b/umap/static/umap/locale/vi_VN.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/zh.js b/umap/static/umap/locale/zh.js index 39e9f406..f4a9cb31 100644 --- a/umap/static/umap/locale/zh.js +++ b/umap/static/umap/locale/zh.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "Save this location as new feature", "Search location": "Search location", "See all": "查看全部", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "全屏", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…", "Shape properties": "Shape properties", diff --git a/umap/static/umap/locale/zh.json b/umap/static/umap/locale/zh.json index 8bb0be18..b2078d4f 100644 --- a/umap/static/umap/locale/zh.json +++ b/umap/static/umap/locale/zh.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "查看全部", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "全屏", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/zh_CN.json b/umap/static/umap/locale/zh_CN.json index f4ecf491..a56ffc3e 100644 --- a/umap/static/umap/locale/zh_CN.json +++ b/umap/static/umap/locale/zh_CN.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/zh_TW.Big5.json b/umap/static/umap/locale/zh_TW.Big5.json index f4ecf491..a56ffc3e 100644 --- a/umap/static/umap/locale/zh_TW.Big5.json +++ b/umap/static/umap/locale/zh_TW.Big5.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "Secret edit link copied to clipboard!", "Secret edit link:": "Secret edit link:", "See all": "See all", - "See data layers": "See data layers", + "See layers": "See layers", "See full screen": "See full screen", "See on OpenStreetMap": "See on OpenStreetMap", "Select data": "Select data", diff --git a/umap/static/umap/locale/zh_TW.js b/umap/static/umap/locale/zh_TW.js index 24ce97ca..ae115824 100644 --- a/umap/static/umap/locale/zh_TW.js +++ b/umap/static/umap/locale/zh_TW.js @@ -230,7 +230,7 @@ const locale = { "Save this location as new feature": "將地點存為新的圖徵", "Search location": "搜尋地點", "See all": "觀看完整內容", - "See data layers": "檢視資料圖層", + "See layers": "檢視資料圖層", "See full screen": "觀看全螢幕", "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "設定為假時，在幻燈片時、資料檢視器和彈出式導航中可將此圖層隱藏...", "Shape properties": "形狀屬性", diff --git a/umap/static/umap/locale/zh_TW.json b/umap/static/umap/locale/zh_TW.json index 76d8996a..1e518b71 100644 --- a/umap/static/umap/locale/zh_TW.json +++ b/umap/static/umap/locale/zh_TW.json @@ -335,7 +335,7 @@ "Secret edit link copied to clipboard!": "複製私密編輯連結到剪貼簿！", "Secret edit link:": "祕密編輯連結：", "See all": "觀看完整內容", - "See data layers": "檢視資料圖層", + "See layers": "檢視資料圖層", "See full screen": "觀看全螢幕", "See on OpenStreetMap": "在開放街圖檢視", "Select data": "Select data", diff --git a/umap/static/umap/test/DataLayer.js b/umap/static/umap/test/DataLayer.js new file mode 100644 index 00000000..93cf8a09 --- /dev/null +++ b/umap/static/umap/test/DataLayer.js @@ -0,0 +1,463 @@ +describe('U.DataLayer', () => { + let path = '/map/99/datalayer/update/62/', + map, + datalayer + + before(async () => { + fetchMock.mock(/\/datalayer\/62\/\?.*/, JSON.stringify(RESPONSES.datalayer62_GET)) + fetchMock.sticky('/map/99/update/settings/', { id: 99 }) + this.options = { + umap_id: 99, + } + MAP = map = initMap({ umap_id: 99 }) + const datalayer_options = defaultDatalayerData() + await map.initDataLayers([datalayer_options]) + datalayer = map.getDataLayerByUmapId(62) + enableEdit() + }) + after(() => { + fetchMock.restore() + resetMap() + }) + + describe('#init()', () => { + it('should be added in datalayers index', () => { + assert.notEqual(map.datalayers_index.indexOf(datalayer), -1) + }) + }) + + describe('#edit()', () => { + var editButton, form, input, forceButton + + it('row in control should be active', () => { + assert.notOk( + qs('.leaflet-control-browse #browse_data_toggle_' + L.stamp(datalayer) + '.off') + ) + }) + + it('should have edit button', () => { + editButton = qs('#browse_data_toggle_' + L.stamp(datalayer) + ' .layer-edit') + assert.ok(editButton) + }) + + it('should have toggle visibility element', () => { + assert.ok(qs('.leaflet-control-browse i.layer-toggle')) + }) + + it('should exist only one datalayer', () => { + assert.equal(qsa('.leaflet-control-browse i.layer-toggle').length, 1) + }) + + it('should build a form on edit button click', () => { + happen.click(editButton) + form = qs('form.umap-form') + input = qs('form.umap-form input[name="name"]') + assert.ok(form) + assert.ok(input) + }) + + it('should update name on input change', () => { + var new_name = 'This is a new name' + input.value = new_name + happen.once(input, { type: 'input' }) + assert.equal(datalayer.options.name, new_name) + }) + + it('should have made datalayer dirty', () => { + assert.ok(datalayer.isDirty) + assert.notEqual(map.dirty_datalayers.indexOf(datalayer), -1) + }) + + it('should have made Map dirty', () => { + assert.ok(map.isDirty) + }) + + it('should call datalayer.save on save button click', (done) => { + const postDatalayer = fetchMock.post(path, () => { + return defaultDatalayerData() + }) + clickSave() + window.setTimeout(() => { + assert(fetchMock.called(path)) + done() + }, 500) + }) + + it('should show alert if server respond 412', (done) => { + cleanAlert() + fetchMock.restore() + fetchMock.post(path, 412) + happen.click(editButton) + input = qs('form.umap-form input[name="name"]') + input.value = 'a new name' + happen.once(input, { type: 'input' }) + clickSave() + window.setTimeout(() => { + assert(L.DomUtil.hasClass(map._container, 'umap-alert')) + assert.notEqual(map.dirty_datalayers.indexOf(datalayer), -1) + const forceButton = qs('#umap-alert-container .umap-action') + assert.ok(forceButton) + done() + }, 500) + }) + + it('should save anyway on force save button click', (done) => { + const forceButton = qs('#umap-alert-container .umap-action') + fetchMock.restore() + fetchMock.post(path, defaultDatalayerData) + happen.click(forceButton) + window.setTimeout(() => { + assert.notOk(qs('#umap-alert-container .umap-action')) + assert(fetchMock.called(path)) + assert.equal(map.dirty_datalayers.indexOf(datalayer), -1) + done() + }, 500) + }) + }) + + describe('#save() new', () => { + let newLayerButton, form, input, newDatalayer, editButton, manageButton + + it('should have a manage datalayers action', () => { + enableEdit() + manageButton = qs('.manage-datalayers') + assert.ok(manageButton) + happen.click(manageButton) + }) + + it('should have a new layer button', () => { + newLayerButton = qs('#umap-panel .add-datalayer') + assert.ok(newLayerButton) + }) + + it('should build a form on new layer button click', () => { + happen.click(newLayerButton) + form = qs('form.umap-form') + input = qs('form.umap-form input[name="name"]') + assert.ok(form) + assert.ok(input) + }) + + it('should have an empty name', () => { + assert.notOk(input.value) + }) + + it('should have created a new datalayer', () => { + assert.equal(map.datalayers_index.length, 2) + newDatalayer = map.datalayers_index[1] + }) + + it('should have made Map dirty', () => { + assert.ok(map.isDirty) + }) + + it('should update name on input change', () => { + var new_name = 'This is a new name' + input.value = new_name + happen.once(input, { type: 'input' }) + assert.equal(newDatalayer.options.name, new_name) + }) + + it('should set umap_id on save callback', async () => { + assert.notOk(newDatalayer.umap_id) + fetchMock.post('/map/99/datalayer/create/', defaultDatalayerData({ id: 63 })) + clickSave() + return new Promise((resolve) => { + window.setTimeout(() => { + assert.equal(newDatalayer.umap_id, 63) + resolve() + }, 1000) + }) + }) + + it('should have unset map dirty', () => { + assert.notOk(map.isDirty) + }) + + it('should have edit button', () => { + editButton = qs('#browse_data_toggle_' + L.stamp(newDatalayer) + ' .layer-edit') + assert.ok(editButton) + }) + + it('should call update if we edit again', async () => { + happen.click(editButton) + assert.notOk(map.isDirty) + input = qs('form.umap-form input[name="name"]') + input.value = "a new name again but we don't care which" + happen.once(input, { type: 'input' }) + assert.ok(map.isDirty) + var response = () => { + return defaultDatalayerData({ pk: 63 }) + } + var spy = sinon.spy(response) + fetchMock.post('/map/99/datalayer/update/63/', spy) + return new Promise((resolve) => { + clickSave() + window.setTimeout(() => { + assert.ok(spy.calledOnce) + resolve() + }, 1000) + }) + }) + }) + + describe('#iconClassChange()', () => { + it('should change icon class', () => { + happen.click(qs('[data-id="' + datalayer._leaflet_id + '"] .layer-edit')) + changeSelectValue( + qs('form#datalayer-advanced-properties select[name=iconClass]'), + 'Circle' + ) + assert.notOk(qs('div.umap-div-icon')) + assert.ok(qs('div.umap-circle-icon')) + happen.click( + qs('form#datalayer-advanced-properties .umap-field-iconClass .undefine') + ) + assert.notOk(qs('div.umap-circle-icon')) + assert.ok(qs('div.umap-div-icon')) + clickCancel() + }) + }) + + describe('#show/hide', () => { + it('should hide features on hide', () => { + assert.ok(qs('div.umap-div-icon')) + assert.ok(qs('path[fill="none"]')) + datalayer.hide() + assert.notOk(qs('div.umap-div-icon')) + assert.notOk(qs('path[fill="none"]')) + }) + + it('should show features on show', () => { + assert.notOk(qs('div.umap-div-icon')) + assert.notOk(qs('path[fill="none"]')) + datalayer.show() + assert.ok(qs('div.umap-div-icon')) + assert.ok(qs('path[fill="none"]')) + }) + }) + + describe('#clone()', () => { + it('should clone everything but the id and the name', () => { + enableEdit() + var clone = datalayer.clone() + assert.notOk(clone.umap_id) + assert.notEqual(clone.options.name, datalayer.name) + assert.ok(clone.options.name) + assert.equal(clone.options.color, datalayer.options.color) + assert.equal(clone.options.stroke, datalayer.options.stroke) + clone._delete() + clickSave() + }) + }) + + describe('#restore()', () => { + var oldConfirm, + newConfirm = () => { + return true + } + + before(() => { + oldConfirm = window.confirm + window.confirm = newConfirm + }) + after(() => { + window.confirm = oldConfirm + }) + + it('should restore everything', (done) => { + enableEdit() + var geojson = L.Util.CopyJSON(RESPONSES.datalayer62_GET) + geojson.features.push({ + geometry: { + type: 'Point', + coordinates: [-1.274658203125, 50.57634993749885], + }, + type: 'Feature', + id: 1807, + properties: { _umap_options: {}, name: 'new point from restore' }, + }) + geojson._umap_options.color = 'Chocolate' + fetchMock.get('/datalayer/62/olderversion.geojson', geojson) + sinon.spy(window, 'confirm') + datalayer.restore('olderversion.geojson') + window.setTimeout(() => { + assert(window.confirm.calledOnce) + window.confirm.restore() + assert.equal(datalayer.umap_id, 62) + assert.ok(datalayer.isDirty) + assert.equal(datalayer._index.length, 4) + assert.ok(qs('path[fill="Chocolate"]')) + done() + }, 1000) + }) + + it('should revert anything on cancel click', () => { + clickCancel() + assert.equal(datalayer._index.length, 3) + assert.notOk(qs('path[fill="Chocolate"]')) + }) + }) + + describe('#smart-options()', () => { + let poly, marker + before(() => { + datalayer.eachLayer(function (layer) { + if (!poly && layer instanceof L.Polygon) { + poly = layer + } + if (!marker && layer instanceof L.Marker) { + marker = layer + } + }) + }) + + it('should parse color variable', () => { + let icon = qs('div.umap-div-icon .icon_container') + poly.properties.mycolor = 'DarkGoldenRod' + marker.properties.mycolor = 'DarkRed' + marker.properties._umap_options.color = undefined + assert.notOk(qs('path[fill="DarkGoldenRod"]')) + assert.equal(icon.style.backgroundColor, 'olivedrab') + datalayer.options.color = '{mycolor}' + datalayer.options.fillColor = '{mycolor}' + datalayer.indexProperties(poly) + datalayer.indexProperties(marker) + datalayer.redraw() + icon = qs('div.umap-div-icon .icon_container') + assert.equal(icon.style.backgroundColor, 'darkred') + assert.ok(qs('path[fill="DarkGoldenRod"]')) + }) + }) + + describe('#facet-search()', () => { + before(async () => { + fetchMock.get(/\/datalayer\/63\/\?.*/, RESPONSES.datalayer63_GET) + map.options.facetKey = 'name' + await map.initDataLayers([RESPONSES.datalayer63_GET._umap_options]) + }) + it('should not impact non browsable layer', () => { + assert.ok(qs('path[fill="SteelBlue"]')) + }) + it('should allow advanced filter', () => { + map.openFacet() + assert.ok(qs('div.umap-facet-search')) + // This one if from the normal datalayer + // it's name is "test", so it should be hidden + // by the filter + assert.ok(qs('path[fill="none"]')) + happen.click(qs('input[data-value="name poly"]')) + assert.notOk(qs('path[fill="none"]')) + // This one comes from a non browsable layer + // so it should not be affected by the filter + assert.ok(qs('path[fill="SteelBlue"]')) + happen.click(qs('input[data-value="name poly"]')) // Undo + }) + it('should allow to control facet label', () => { + map.options.facetKey = 'name|Nom' + map.openFacet() + assert.ok(qs('div.umap-facet-search h5')) + assert.equal(qs('div.umap-facet-search h5').textContent, 'Nom') + }) + }) + describe('#zoomEnd', () => { + it('should honour the fromZoom option', () => { + map.setZoom(6, { animate: false }) + assert.ok(qs('path[fill="none"]')) + datalayer.options.fromZoom = 6 + map.setZoom(5, { animate: false }) + assert.notOk(qs('path[fill="none"]')) + map.setZoom(6, { animate: false }) + assert.ok(qs('path[fill="none"]')) + }) + + it('should honour the toZoom option', () => { + map.setZoom(6, { animate: false }) + assert.ok(qs('path[fill="none"]')) + datalayer.options.toZoom = 6 + map.setZoom(7, { animate: false }) + assert.notOk(qs('path[fill="none"]')) + map.setZoom(6, { animate: false }) + assert.ok(qs('path[fill="none"]')) + }) + }) + + describe('#displayOnLoad', () => { + before(() => { + fetchMock.get(/\/datalayer\/64\/\?.*/, RESPONSES.datalayer64_GET) + }) + + beforeEach(async () => { + await map.initDataLayers([RESPONSES.datalayer64_GET._umap_options]) + datalayer = map.getDataLayerByUmapId(64) + map.setZoom(10, { animate: false }) + }) + + afterEach(() => { + datalayer._delete() + }) + + it('should not display layer at load', () => { + assert.notOk(qs('path[fill="AliceBlue"]')) + }) + + it('should display on click', (done) => { + happen.click(qs(`[data-id='${L.stamp(datalayer)}'] .layer-toggle`)) + window.setTimeout(() => { + assert.ok(qs('path[fill="AliceBlue"]')) + done() + }, 500) + }) + + it('should not display on zoom', (done) => { + map.setZoom(9, { animate: false }) + window.setTimeout(() => { + assert.notOk(qs('path[fill="AliceBlue"]')) + done() + }, 500) + }) + }) + + describe('#delete()', () => { + let deleteLink, + deletePath = '/map/99/datalayer/delete/62/' + before(() => { + datalayer = map.getDataLayerByUmapId(62) + }) + + it('should have a delete link in update form', () => { + enableEdit() + happen.click(qs('#browse_data_toggle_' + L.stamp(datalayer) + ' .layer-edit')) + deleteLink = qs('button.delete_datalayer_button') + assert.ok(deleteLink) + }) + + it('should delete features on datalayer delete', () => { + happen.click(deleteLink) + assert.notOk(qs('div.icon_container')) + }) + + it('should have set map dirty', () => { + assert.ok(map.isDirty) + }) + + it('should delete layer control row on delete', () => { + assert.notOk( + qs('.leaflet-control-browse #browse_data_toggle_' + L.stamp(datalayer)) + ) + }) + + it('should be removed from map.datalayers_index', () => { + assert.equal(map.datalayers_index.indexOf(datalayer), -1) + }) + + it('should be removed from map.datalayers', () => { + assert.notOk(map.datalayers[L.stamp(datalayer)]) + }) + + it('should be visible again on edit cancel', () => { + clickCancel() + assert.ok(qs('div.icon_container')) + }) + }) +}) diff --git a/umap/static/umap/test/TableEditor.js b/umap/static/umap/test/TableEditor.js new file mode 100644 index 00000000..52f82898 --- /dev/null +++ b/umap/static/umap/test/TableEditor.js @@ -0,0 +1,104 @@ +describe('L.TableEditor', () => { + let path = '/map/99/datalayer/edit/62/', + datalayer + + before(async () => { + await fetchMock.mock( + /\/datalayer\/62\/\?.*/, + JSON.stringify(RESPONSES.datalayer62_GET) + ) + this.options = { + umap_id: 99, + } + map = initMap({ umap_id: 99 }) + const datalayer_options = defaultDatalayerData() + await map.initDataLayers([datalayer_options]) + datalayer = map.getDataLayerByUmapId(62) + enableEdit() + }) + after(() => { + fetchMock.restore() + clickCancel() + resetMap() + }) + + describe('#open()', () => { + var button + + it('should exist table click on edit mode', () => { + button = qs( + '#browse_data_toggle_' + L.stamp(datalayer) + ' .layer-table-edit' + ) + expect(button).to.be.ok + }) + + it('should open table button click', () => { + happen.click(button) + expect(qs('#umap-panel div.table')).to.be.ok + expect(qsa('#umap-panel div.table form').length).to.eql(3) // One per feature. + expect(qsa('#umap-panel div.table input').length).to.eql(3) // One per feature and per property. + }) + }) + describe('#properties()', () => { + var feature + + before(() => { + var firstIndex = datalayer._index[0] + feature = datalayer._layers[firstIndex] + }) + + it('should create new property column', () => { + var newPrompt = () => { + return 'newprop' + } + var oldPrompt = window.prompt + window.prompt = newPrompt + var button = qs('#umap-panel .add-property') + expect(button).to.be.ok + happen.click(button) + expect(qsa('#umap-panel div.table input').length).to.eql(6) // One per feature and per property. + window.prompt = oldPrompt + }) + + it('should populate feature property on fill', () => { + var input = qs( + 'form#umap-feature-properties_' + L.stamp(feature) + ' input[name=newprop]' + ) + changeInputValue(input, 'the value') + expect(feature.properties.newprop).to.eql('the value') + }) + + it('should update property name on update click', () => { + var newPrompt = () => { + return 'newname' + } + var oldPrompt = window.prompt + window.prompt = newPrompt + var button = qs('#umap-panel div.thead div.tcell:last-of-type .umap-edit') + expect(button).to.be.ok + happen.click(button) + expect(qsa('#umap-panel div.table input').length).to.eql(6) + expect(feature.properties.newprop).to.be.undefined + expect(feature.properties.newname).to.eql('the value') + window.prompt = oldPrompt + }) + + it('should update property on delete click', () => { + var oldConfirm, + newConfirm = () => { + return true + } + oldConfirm = window.confirm + window.confirm = newConfirm + var button = qs( + '#umap-panel div.thead div.tcell:last-of-type .umap-delete' + ) + expect(button).to.be.ok + happen.click(button) + FEATURE = feature + expect(qsa('#umap-panel div.table input').length).to.eql(3) + expect(feature.properties.newname).to.be.undefined + window.confirm = oldConfirm + }) + }) +}) diff --git a/umap/tests/integration/test_anonymous_owned_map.py b/umap/tests/integration/test_anonymous_owned_map.py index 89c590d7..2bb94f3b 100644 --- a/umap/tests/integration/test_anonymous_owned_map.py +++ b/umap/tests/integration/test_anonymous_owned_map.py @@ -131,7 +131,7 @@ def test_anonymous_can_add_marker_on_editable_layer( def test_can_change_perms_after_create(tilelayer, live_server, page): page.goto(f"{live_server.url}/en/map/new") # Create a layer - page.get_by_title("Manage layers").click() + page.get_by_title("See layers").click() page.get_by_role("button", name="Add a layer").click() page.locator("input[name=name]").fill("Layer 1") save = page.get_by_role("button", name="Save") diff --git a/umap/tests/integration/test_browser.py b/umap/tests/integration/test_browser.py index 41d89584..2912f932 100644 --- a/umap/tests/integration/test_browser.py +++ b/umap/tests/integration/test_browser.py @@ -63,7 +63,7 @@ def bootstrap(map, live_server): def test_data_browser_should_be_open(live_server, page, bootstrap, map): page.goto(f"{live_server.url}{map.get_absolute_url()}") - el = page.locator(".umap-browse-data") + el = page.locator(".umap-browser") expect(el).to_be_visible() expect(page.get_by_text("one point in france")).to_be_visible() expect(page.get_by_text("one line in new zeland")).to_be_visible() @@ -81,7 +81,7 @@ def test_data_browser_should_be_filterable(live_server, page, bootstrap, map): expect(filter_).to_be_visible() filter_.type("poly") expect(page.get_by_title("Features in this layer: 1/3")).to_be_visible() - expect(page.get_by_title("Features in this layer: 1/3")).to_have_text("1/3") + expect(page.get_by_title("Features in this layer: 1/3")).to_have_text("(1/3)") expect(page.get_by_text("one point in france")).to_be_hidden() expect(page.get_by_text("one line in new zeland")).to_be_hidden() expect(page.get_by_text("one polygon in greenland")).to_be_visible() @@ -159,7 +159,7 @@ def test_data_browser_bbox_filter_should_be_persistent( el = page.get_by_text("Current map view") expect(el).to_be_visible() el.click() - browser = page.locator("#umap-ui-container") + browser = page.locator("#umap-panel") expect(browser.get_by_text("one point in france")).to_be_visible() expect(browser.get_by_text("one line in new zeland")).to_be_hidden() expect(browser.get_by_text("one polygon in greenland")).to_be_hidden() @@ -171,8 +171,7 @@ def test_data_browser_bbox_filter_should_be_persistent( expect(browser.get_by_text("one point in france")).to_be_hidden() expect(browser.get_by_text("one line in new zeland")).to_be_hidden() expect(browser.get_by_text("one polygon in greenland")).to_be_hidden() - page.get_by_title("See data layers").click() - page.get_by_role("button", name="Browse data").click() + page.get_by_title("See layers").click() expect(browser.get_by_text("one point in france")).to_be_visible() expect(browser.get_by_text("one line in new zeland")).to_be_hidden() expect(browser.get_by_text("one polygon in greenland")).to_be_hidden() @@ -185,7 +184,7 @@ def test_data_browser_bbox_filtered_is_clickable(live_server, page, bootstrap, m el = page.get_by_text("Current map view") expect(el).to_be_visible() el.click() - browser = page.locator("#umap-ui-container") + browser = page.locator("#umap-panel") expect(browser.get_by_text("one point in france")).to_be_visible() expect(browser.get_by_text("one line in new zeland")).to_be_hidden() expect(browser.get_by_text("one polygon in greenland")).to_be_hidden() @@ -217,18 +216,6 @@ def test_data_browser_with_variable_in_name(live_server, page, bootstrap, map): expect(page.get_by_text("one polygon in greenland (polygon)")).to_be_visible() -def test_can_open_databrowser_from_layers_list(live_server, map, page, bootstrap): - page.goto(f"{live_server.url}{map.get_absolute_url()}") - page.get_by_title("See data layers").click() - page.get_by_role("button", name="Browse data").click() - browser = page.locator(".umap-browse-data") - expect(browser).to_be_visible() - expect(browser.get_by_text("test datalayer")).to_be_visible() - expect(browser.get_by_text("one point in france")).to_be_visible() - expect(browser.get_by_text("one line in new zeland")).to_be_visible() - expect(browser.get_by_text("one polygon in greenland")).to_be_visible() - - def test_should_sort_features_in_natural_order(live_server, map, page): map.settings["properties"]["onLoadPanel"] = "databrowser" map.save() @@ -238,7 +225,7 @@ def test_should_sort_features_in_natural_order(live_server, map, page): datalayer_data["features"][2]["properties"]["name"] = "100. a line" DataLayerFactory(map=map, data=datalayer_data) page.goto(f"{live_server.url}{map.get_absolute_url()}") - features = page.locator(".umap-browse-data li") + features = page.locator(".umap-browser .datalayer li") expect(features).to_have_count(3) expect(features.nth(0)).to_have_text("1. a poly") expect(features.nth(1)).to_have_text("9. a marker") @@ -249,7 +236,7 @@ def test_should_redraw_list_on_feature_delete(live_server, openmap, page, bootst page.goto(f"{live_server.url}{openmap.get_absolute_url()}") # Enable edit page.get_by_role("button", name="Edit").click() - buttons = page.locator(".umap-browse-data li .feature-delete") + buttons = page.locator(".umap-browser .datalayer li .feature-delete") expect(buttons).to_have_count(3) page.on("dialog", lambda dialog: dialog.accept()) buttons.nth(0).click() @@ -265,7 +252,7 @@ def test_should_show_header_for_display_on_load_false( datalayer.settings["name"] = "This layer is not loaded" datalayer.save() page.goto(f"{live_server.url}{map.get_absolute_url()}") - browser = page.locator(".umap-browse-data") + browser = page.locator(".umap-browser") expect(browser).to_be_visible() expect(browser.get_by_text("This layer is not loaded")).to_be_visible() @@ -279,7 +266,7 @@ def test_should_use_color_variable(live_server, map, page): datalayer_data["features"][2]["properties"]["mycolor"] = "DarkGreen" DataLayerFactory(map=map, data=datalayer_data) page.goto(f"{live_server.url}{map.get_absolute_url()}") - features = page.locator(".umap-browse-data li .feature-color") + features = page.locator(".umap-browser .datalayer li .feature-color") expect(features).to_have_count(3) # DarkGreen expect(features.nth(0)).to_have_css("background-color", "rgb(0, 100, 0)") diff --git a/umap/tests/integration/test_edit_datalayer.py b/umap/tests/integration/test_edit_datalayer.py index 2671cdf1..f0d4e50a 100644 --- a/umap/tests/integration/test_edit_datalayer.py +++ b/umap/tests/integration/test_edit_datalayer.py @@ -12,16 +12,15 @@ def test_should_have_fieldset_for_layer_type_properties(page, live_server, tilel page.goto(f"{live_server.url}/en/map/new/") # Open DataLayers list - button = page.get_by_title("Manage Layers") + button = page.get_by_title("See layers") expect(button).to_be_visible() button.click() # Create a layer - page.get_by_title("Manage layers").click() page.get_by_role("button", name="Add a layer").click() page.locator("input[name=name]").fill("Layer 1") - select = page.locator("#umap-ui-container .umap-field-type select") + select = page.locator("#umap-panel .umap-field-type select") expect(select).to_be_visible() choropleth_header = page.get_by_text("Choropleth: settings") diff --git a/umap/tests/integration/test_import.py b/umap/tests/integration/test_import.py index 7c278342..e780750c 100644 --- a/umap/tests/integration/test_import.py +++ b/umap/tests/integration/test_import.py @@ -24,10 +24,6 @@ def test_umap_import_from_file(live_server, tilelayer, page): button = page.get_by_role("button", name="Import", exact=True) expect(button).to_be_visible() button.click() - layers = page.locator(".umap-browse-datalayers li") - expect(layers).to_have_count(2) - nonloaded = page.locator(".umap-browse-datalayers li.off") - expect(nonloaded).to_have_count(1) assert file_input.input_value() # Close the import panel page.keyboard.press("Escape") @@ -35,6 +31,11 @@ def test_umap_import_from_file(live_server, tilelayer, page): expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text( "Carte sans nom" ) + page.get_by_title("See layers").click() + layers = page.locator(".umap-browser .datalayer") + expect(layers).to_have_count(2) + nonloaded = page.locator(".umap-browser .datalayer.off") + expect(nonloaded).to_have_count(1) def test_umap_import_from_textarea(live_server, tilelayer, page, settings): @@ -67,7 +68,7 @@ def test_umap_import_from_textarea(live_server, tilelayer, page, settings): def test_import_geojson_from_textarea(tilelayer, live_server, page): page.goto(f"{live_server.url}/map/new/") - layers = page.locator(".umap-browse-datalayers li") + layers = page.locator(".umap-browser .datalayer") markers = page.locator(".leaflet-marker-icon") paths = page.locator("path") expect(markers).to_have_count(0) @@ -84,6 +85,7 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page): expect(button).to_be_visible() button.click() # A layer has been created + page.get_by_title("See layers").click() expect(layers).to_have_count(1) expect(markers).to_have_count(2) expect(paths).to_have_count(3) diff --git a/umap/tests/integration/test_map.py b/umap/tests/integration/test_map.py index f0178883..90b691bc 100644 --- a/umap/tests/integration/test_map.py +++ b/umap/tests/integration/test_map.py @@ -42,10 +42,10 @@ def test_default_view_without_datalayer_should_use_default_center( ): datalayer.settings["displayOnLoad"] = False datalayer.save() - page.goto(f"{live_server.url}{map.get_absolute_url()}") + page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers") # Hash is defined, so map is initialized expect(page).to_have_url(re.compile(r".*#7/48\..+/13\..+")) - layers = page.locator(".umap-browse-datalayers li") + layers = page.locator(".umap-browser .datalayer h5") expect(layers).to_have_count(1) @@ -56,10 +56,10 @@ def test_default_view_latest_without_datalayer_should_use_default_center( datalayer.save() map.settings["properties"]["defaultView"] = "latest" map.save() - page.goto(f"{live_server.url}{map.get_absolute_url()}") + page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers") # Hash is defined, so map is initialized expect(page).to_have_url(re.compile(r".*#7/48\..+/13\..+")) - layers = page.locator(".umap-browse-datalayers li") + layers = page.locator(".umap-browser .datalayer h5") expect(layers).to_have_count(1) @@ -70,20 +70,20 @@ def test_default_view_data_without_datalayer_should_use_default_center( datalayer.save() map.settings["properties"]["defaultView"] = "data" map.save() - page.goto(f"{live_server.url}{map.get_absolute_url()}") + page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers") # Hash is defined, so map is initialized expect(page).to_have_url(re.compile(r".*#7/48\..+/13\..+")) - layers = page.locator(".umap-browse-datalayers li") + layers = page.locator(".umap-browser .datalayer h5") expect(layers).to_have_count(1) def test_default_view_latest_with_marker(map, live_server, datalayer, page): map.settings["properties"]["defaultView"] = "latest" map.save() - page.goto(f"{live_server.url}{map.get_absolute_url()}") + page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers") # Hash is defined, so map is initialized expect(page).to_have_url(re.compile(r".*#7/48\..+/14\..+")) - layers = page.locator(".umap-browse-datalayers li") + layers = page.locator(".umap-browser .datalayer h5") expect(layers).to_have_count(1) @@ -109,9 +109,9 @@ def test_default_view_latest_with_line(map, live_server, page): DataLayerFactory(map=map, data=data) map.settings["properties"]["defaultView"] = "latest" map.save() - page.goto(f"{live_server.url}{map.get_absolute_url()}") + page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers") expect(page).to_have_url(re.compile(r".*#8/48\..+/2\..+")) - layers = page.locator(".umap-browse-datalayers li") + layers = page.locator(".umap-browser .datalayer h5") expect(layers).to_have_count(1) @@ -140,9 +140,9 @@ def test_default_view_latest_with_polygon(map, live_server, page): DataLayerFactory(map=map, data=data) map.settings["properties"]["defaultView"] = "latest" map.save() - page.goto(f"{live_server.url}{map.get_absolute_url()}") + page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers") expect(page).to_have_url(re.compile(r".*#8/48\..+/2\..+")) - layers = page.locator(".umap-browse-datalayers li") + layers = page.locator(".umap-browser .datalayer h5") expect(layers).to_have_count(1) @@ -168,10 +168,10 @@ def test_remote_layer_should_not_be_used_as_datalayer_for_created_features( } datalayer.save() page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit") - toggle = page.get_by_role("button", name="See data layers") + toggle = page.get_by_role("button", name="See layers") expect(toggle).to_be_visible() toggle.click() - layers = page.locator(".umap-browse-datalayers li") + layers = page.locator(".umap-browser .datalayer h5") expect(layers).to_have_count(1) map_el = page.locator("#map") add_marker = page.get_by_title("Draw a marker") @@ -183,6 +183,7 @@ def test_remote_layer_should_not_be_used_as_datalayer_for_created_features( expect(marker).to_have_count(1) # A new datalayer has been created to host this created feature # given the remote one cannot accept new features + page.get_by_title("See layers").click() expect(layers).to_have_count(2) @@ -195,9 +196,9 @@ def test_can_hide_datalayer_from_caption(openmap, live_server, datalayer, page): toggle.click() layers = page.locator(".umap-caption .datalayer-legend") expect(layers).to_have_count(1) - found = page.locator("#umap-ui-container").get_by_text(datalayer.name) + found = page.locator("#umap-panel").get_by_text(datalayer.name) expect(found).to_be_visible() - hidden = page.locator("#umap-ui-container").get_by_text(other.name) + hidden = page.locator("#umap-panel").get_by_text(other.name) expect(hidden).to_be_hidden() diff --git a/umap/tests/integration/test_owned_map.py b/umap/tests/integration/test_owned_map.py index f753baba..4013fe86 100644 --- a/umap/tests/integration/test_owned_map.py +++ b/umap/tests/integration/test_owned_map.py @@ -186,7 +186,7 @@ def test_can_change_perms_after_create(tilelayer, live_server, login, user): page = login(user) page.goto(f"{live_server.url}/en/map/new") # Create a layer - page.get_by_title("Manage layers").click() + page.get_by_title("See layers").click() page.get_by_role("button", name="Add a layer").click() page.locator("input[name=name]").fill("Layer 1") save = page.get_by_role("button", name="Save") diff --git a/umap/tests/integration/test_picto.py b/umap/tests/integration/test_picto.py index 33a2c214..192f28e4 100644 --- a/umap/tests/integration/test_picto.py +++ b/umap/tests/integration/test_picto.py @@ -171,7 +171,7 @@ def test_can_use_remote_url_as_picto(openmap, live_server, page, pictos): input_el.blur() expect(marker).to_have_attribute("src", "https://foo.bar/img.jpg") # Now close and reopen the form, it should still be the URL tab - close = page.locator("#umap-ui-container .toolbox").get_by_title("Close") + close = page.locator("#umap-panel .toolbox").get_by_title("Close") expect(close).to_be_visible() close.click() edit_settings.click() @@ -210,7 +210,7 @@ def test_can_use_char_as_picto(openmap, live_server, page, pictos): expect(marker).to_have_count(1) expect(marker).to_have_text("♩") # Now close and reopen the form, it should still be the URL tab - close = page.locator("#umap-ui-container .toolbox").get_by_title("Close") + close = page.locator("#umap-panel .toolbox").get_by_title("Close") expect(close).to_be_visible() close.click() edit_settings.click() diff --git a/umap/tests/integration/test_querystring.py b/umap/tests/integration/test_querystring.py index 92962ded..1393a89b 100644 --- a/umap/tests/integration/test_querystring.py +++ b/umap/tests/integration/test_querystring.py @@ -15,30 +15,23 @@ def test_scale_control(map, live_server, datalayer, page): def test_datalayers_control(map, live_server, datalayer, page): - control = page.locator(".umap-browse-toggle") - box = page.locator(".umap-browse-datalayers") - more = page.get_by_title("More controls") + control = page.locator(".umap-control-browse") + browser = page.locator(".umap-browser") page.goto(f"{live_server.url}{map.get_absolute_url()}") expect(control).to_be_visible() - expect(box).to_be_hidden() + expect(browser).to_be_hidden() page.goto(f"{live_server.url}{map.get_absolute_url()}?datalayersControl=true") expect(control).to_be_visible() - expect(box).to_be_hidden() + expect(browser).to_be_hidden() page.goto(f"{live_server.url}{map.get_absolute_url()}?datalayersControl=null") expect(control).to_be_hidden() - expect(more).to_be_visible() - more.click() - expect(control).to_be_visible() - expect(box).to_be_hidden() + expect(browser).to_be_hidden() page.goto(f"{live_server.url}{map.get_absolute_url()}?datalayersControl=false") expect(control).to_be_hidden() - expect(more).to_be_visible() - more.click() - expect(control).to_be_hidden() - expect(box).to_be_hidden() + expect(browser).to_be_hidden() page.goto(f"{live_server.url}{map.get_absolute_url()}?datalayersControl=expanded") expect(control).to_be_hidden() - expect(box).to_be_visible() + expect(browser).to_be_visible() def test_can_deactivate_wheel_from_query_string(map, live_server, page): diff --git a/umap/tests/integration/test_statics.py b/umap/tests/integration/test_statics.py index f1aa9306..3b92fb7d 100644 --- a/umap/tests/integration/test_statics.py +++ b/umap/tests/integration/test_statics.py @@ -42,5 +42,6 @@ def test_javascript_have_been_loaded( # Should be in French, so hashed locale file has been loaded correctly button = page.get_by_text("Voir les calques") expect(button).to_be_visible() - layers = page.locator(".umap-browse-datalayers li") + button.click() + layers = page.locator(".umap-browser .datalayer") expect(layers).to_have_count(1)