umap-project 2.5.1__py3-none-any.whl → 2.6.0b0__py3-none-any.whl

umap/static/umap/js/umap.js

@@ -62,8 +62,10 @@ U.Map = L.Map.extend({
       this.editPanel = new U.EditPanel(this)
       this.fullPanel = new U.FullPanel(this)
     }
-    L.DomEvent.on(document.body, 'dataloading', (e) => this.fire('dataloading', e))
-    L.DomEvent.on(document.body, 'dataload', (e) => this.fire('dataload', e))
+    if (!this.options.noControl) {
+      L.DomEvent.on(document.body, 'dataloading', (e) => this.fire('dataloading', e))
+      L.DomEvent.on(document.body, 'dataload', (e) => this.fire('dataload', e))
+    }
     this.server = new U.ServerRequest()
     this.request = new U.Request()
 
@@ -193,7 +195,7 @@ U.Map = L.Map.extend({
     window.onbeforeunload = () => (this.editEnabled && this.isDirty) || null
     this.backup()
     this.initContextMenu()
-    this.on('click contextmenu.show', this.closeInplaceToolbar)
+    this.on('click', this.closeInplaceToolbar)
   },
 
   initSyncEngine: async function () {
@@ -393,7 +395,7 @@ U.Map = L.Map.extend({
     this._controls.search = new U.SearchControl()
     this._controls.embed = new L.Control.Embed(this)
     this._controls.tilelayersChooser = new U.TileLayerChooser(this)
-    if (this.options.user) this._controls.star = new U.StarControl(this)
+    if (this.options.user?.id) this._controls.star = new U.StarControl(this)
     this._controls.editinosm = new L.Control.EditInOSM({
       position: 'topleft',
       widgetOptions: {
@@ -841,11 +843,9 @@ U.Map = L.Map.extend({
       this.options.tilelayer = tilelayer.toJSON()
       this.isDirty = true
     }
-    if (this._controls.tilelayersChooser)
-      this._controls.tilelayersChooser.openSwitcher({
-        callback: callback,
-        className: 'dark',
-      })
+    if (this._controls.tilelayersChooser) {
+      this._controls.tilelayersChooser.openSwitcher({ callback, edit: true })
+    }
   },
 
   toGeoJSON: function () {
@@ -863,7 +863,7 @@ U.Map = L.Map.extend({
   },
 
   eachFeature: function (callback, context) {
-    this.eachDataLayer((datalayer) => {
+    this.eachBrowsableDataLayer((datalayer) => {
       if (datalayer.isVisible()) datalayer.eachFeature(callback, context)
     })
   },
@@ -1048,7 +1048,15 @@ U.Map = L.Map.extend({
     if (error) {
       return
     }
-
+    if (data.login_required) {
+      window.onLogin = () => this.saveSelf()
+      window.open(data.login_required)
+      return
+    }
+    if (data.user?.id) {
+      this.options.user = data.user
+      this.renderEditToolbar()
+    }
     if (!this.options.umap_id) {
       this.options.umap_id = data.id
       this.permissions.setOptions(data.permissions)
@@ -1219,46 +1227,12 @@ U.Map = L.Map.extend({
   _editDefaultProperties: function (container) {
     const optionsFields = [
       'options.zoomTo',
-      ['options.easing', { handler: 'Switch', label: L._('Animated transitions') }],
+      'options.easing',
       'options.labelKey',
-      [
-        'options.sortKey',
-        {
-          handler: 'BlurInput',
-          helpEntries: 'sortKey',
-          placeholder: L._('Default: name'),
-          label: L._('Sort key'),
-          inheritable: true,
-        },
-      ],
-      [
-        'options.filterKey',
-        {
-          handler: 'Input',
-          helpEntries: 'filterKey',
-          placeholder: L._('Default: name'),
-          label: L._('Search keys'),
-          inheritable: true,
-        },
-      ],
-      [
-        'options.facetKey',
-        {
-          handler: 'BlurInput',
-          helpEntries: 'facetKey',
-          placeholder: L._('Example: key1,key2|Label 2,key3|Label 3|checkbox'),
-          label: L._('Filters keys'),
-        },
-      ],
-      [
-        'options.slugKey',
-        {
-          handler: 'BlurInput',
-          helpEntries: 'slugKey',
-          placeholder: L._('Default: name'),
-          label: L._('Feature identifier key'),
-        },
-      ],
+      'options.sortKey',
+      'options.filterKey',
+      'options.facetKey',
+      'options.slugKey',
     ]
 
     builder = new U.FormBuilder(this, optionsFields)
@@ -1485,13 +1459,13 @@ U.Map = L.Map.extend({
     const advancedActions = L.DomUtil.createFieldset(container, L._('Advanced actions'))
     const advancedButtons = L.DomUtil.create('div', 'button-bar half', advancedActions)
     if (this.permissions.isOwner()) {
-      L.DomUtil.createButton(
-        'button umap-delete',
-        advancedButtons,
-        L._('Delete'),
-        this.del,
-        this
-      )
+      const deleteButton = U.Utils.loadTemplate(`
+        <button class="button" type="button">
+          <i class="icon icon-24 icon-delete"></i>${L._('Delete')}
+        </button>`)
+      deleteButton.addEventListener('click', () => this.del())
+      advancedButtons.appendChild(deleteButton)
+
       L.DomUtil.createButton(
         'button umap-empty',
         advancedButtons,
@@ -1589,6 +1563,7 @@ U.Map = L.Map.extend({
     this.editPanel.close()
     this.fullPanel.close()
     this.sync.stop()
+    this.closeInplaceToolbar()
   },
 
   hasEditMode: function () {
@@ -1607,7 +1582,7 @@ U.Map = L.Map.extend({
     )
     const name = L.DomUtil.create('h3', '', container)
     L.DomEvent.disableClickPropagation(container)
-    this.permissions.addOwnerLink('span', container)
+    this.addAuthorLink('span', container)
     if (this.getOption('captionMenus')) {
       L.DomUtil.createButton(
         'umap-about-link flat',
@@ -1663,11 +1638,13 @@ U.Map = L.Map.extend({
   },
 
   del: async function () {
-    if (confirm(L._('Are you sure you want to delete this map?'))) {
-      const url = this.urls.get('map_delete', { map_id: this.options.umap_id })
-      const [data, response, error] = await this.server.post(url)
-      if (data.redirect) window.location = data.redirect
-    }
+    this.dialog
+      .confirm(L._('Are you sure you want to delete this map?'))
+      .then(async () => {
+        const url = this.urls.get('map_delete', { map_id: this.options.umap_id })
+        const [data, response, error] = await this.server.post(url)
+        if (data.redirect) window.location = data.redirect
+      })
   },
 
   clone: async function () {
@@ -1866,6 +1843,14 @@ U.Map = L.Map.extend({
     return url
   },
 
+  getFeatureById: function (id) {
+    let feature
+    for (const datalayer of Object.values(this.datalayers)) {
+      feature = datalayer.getFeatureById(id)
+      if (feature) return feature
+    }
+  },
+
   closeInplaceToolbar: function () {
     const toolbar = this._toolbars[L.Toolbar.Popup._toolbar_class_id]
     if (toolbar) toolbar.remove()
@@ -1902,4 +1887,21 @@ U.Map = L.Map.extend({
       .filter((val, idx, arr) => arr.indexOf(val) === idx)
       .sort(U.Utils.naturalSort)
   },
+
+  addAuthorLink: function (element, container) {
+    if (this.options.author?.name) {
+      const authorContainer = L.DomUtil.add(
+        element,
+        'umap-map-author',
+        container,
+        ` ${L._('by')} `
+      )
+      L.DomUtil.createLink(
+        '',
+        authorContainer,
+        this.options.author.name,
+        this.options.author.url
+      )
+    }
+  },
 })

umap/static/umap/locale/br.js

@@ -426,15 +426,15 @@ const locale = {
     "Filters keys": "Filters keys",
     "Filter data": "Roadennoù ar sil",
     "Search map features…": "Klask perzhioù ar gartenn..",
-    "Reset all": "Reset all",
-    "Open browser": "Open browser",
+    "Reset all": "Adlakaat pep tra",
+    "Open browser": "Digeriñ ar merdeer",
     "Open caption": "Open caption",
     "Your map has been created with an anonymous account!": "Your map has been created with an anonymous account!",
     "Real-time collaboration": "Real-time collaboration",
-    "Cannot parse data": "Cannot parse data",
-    "Start typing...": "Start typing...",
-    "No result": "No result",
-    "Data browser": "Data browser",
+    "Cannot parse data": "N'haller ket dielfennañ ar roadennoù",
+    "Start typing...": "Krogit da skrivañ...",
+    "No result": "Disoc'h ebet",
+    "Data browser": "Furchal ar roadennoù",
     "When providing an URL, uMap can copy the remote data in a layer, or add this URL as remote source of the layer. In that case, data will always be fetched from that URL, and thus be up to date, but it will not be possible to edit it inside uMap.": "When providing an URL, uMap can copy the remote data in a layer, or add this URL as remote source of the layer. In that case, data will always be fetched from that URL, and thus be up to date, but it will not be possible to edit it inside uMap.",
     "Overpass supported expressions": "Overpass supported expressions",
     "key (eg. building)": "key (eg. building)",
@@ -445,25 +445,25 @@ const locale = {
     "key=\"value|value2\" (eg. name=\"Paris|Berlin\")": "key=\"value|value2\" (eg. name=\"Paris|Berlin\")",
     "More info about Overpass syntax": "More info about Overpass syntax",
     "For more complex needs, see": "For more complex needs, see",
-    "Choose data": "Choose data",
+    "Choose data": "Dibab ar roadennoù",
     "Import helpers:": "Import helpers:",
-    "Choose the format": "Choose the format",
-    "Choose the layer": "Choose the layer",
-    "Layer name": "Layer name",
+    "Choose the format": "Dibab ar furmad",
+    "Choose the layer": "Dibab ar gwiskad",
+    "Layer name": "Anv ar gwiskad",
     "Choose import mode": "Choose import mode",
-    "Copy into the layer": "Copy into the layer",
+    "Copy into the layer": "Eilañ e-barzh ar gwiskad",
     "Link to the layer as remote data": "Link to the layer as remote data",
     "Condition": "Condition",
-    "key=value or key!=value": "key=value or key!=value",
-    "Are you sure you want to delete this rule?": "Are you sure you want to delete this rule?",
-    "empty rule": "empty rule",
+    "key=value or key!=value": "key=value pe key!=value",
+    "Are you sure you want to delete this rule?": "Ha sur oc'h e faot deoc'h dilemel ar reolenn-mañ?",
+    "empty rule": "Reolenn goullo",
     "Conditional style rules": "Conditional style rules",
-    "Add rule": "Add rule",
-    "Browser: data": "Browser: data",
-    "Browser: layers": "Browser: layers",
-    "Browser: filters": "Browser: filters",
+    "Add rule": "Ouzhpennañ ur reolenn",
+    "Browser: data": "Merdeer: roadennoù",
+    "Browser: layers": "Merdeer: gwiskadoù",
+    "Browser: filters": "Merdeer: siloù",
     "Enable real-time collaboration": "Enable real-time collaboration",
-    "✅ Copied!": "✅ Copied!",
+    "✅ Copied!": "✅ Eilet !",
     "Choose a dataset": "Choose a dataset",
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
@@ -473,32 +473,32 @@ const locale = {
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
     "Expression": "Expression",
-    "Geometry mode": "Geometry mode",
+    "Geometry mode": "Mod mentoniezh",
     "Only geometry centers": "Only geometry centers",
     "Search area": "Search area",
     "Type area name, or let empty to load data in current map view": "Type area name, or let empty to load data in current map view",
-    "Data successfully imported!": "Data successfully imported!",
-    "My Dashboard ({username})": "My Dashboard ({username})",
-    "Clear data": "Clear data",
-    "Remove layers": "Remove layers",
-    "Categorized": "Categorized",
-    "Alphabetical": "Alphabetical",
-    "Category property": "Category property",
+    "Data successfully imported!": "Roadennoù enporzhiet gant berzh!",
+    "My Dashboard ({username})": "Ma Zaolenn-vourzh ({username})",
+    "Clear data": "Skarzhañ ar roadennoù",
+    "Remove layers": "Lemel ar gwiskadoù",
+    "Categorized": "Dre rummad",
+    "Alphabetical": "Urzh al lizherenneg",
+    "Category property": "Perzh",
     "Color palette": "Color palette",
-    "Categories": "Categories",
+    "Categories": "Rummadoù",
     "Comma separated list of categories.": "Comma separated list of categories.",
     "Categories mode": "Categories mode",
     "Remove filter for this column": "Remove filter for this column",
     "Add filter for this column": "Add filter for this column",
-    "Rename this column": "Rename this column",
-    "Delete this column": "Delete this column",
-    "Name “{name}” should not contain a dot.": "Name “{name}” should not contain a dot.",
-    "This name already exists: “{name}”": "This name already exists: “{name}”",
-    "Delete selected rows": "Delete selected rows",
+    "Rename this column": "Adenvel ar bann-mañ",
+    "Delete this column": "Dilemel ar bann-mañ",
+    "Name “{name}” should not contain a dot.": "Ne rankfe ket bout ur pik e-barzh an anv “{name}”.",
+    "This name already exists: “{name}”": "Bout 'zo an anv-se dija:  “{name}”",
+    "Delete selected rows": "Dilemel al linennoù diuzet",
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
-    "OK": "OK",
-    "Cancel": "Cancel"
+    "OK": "Mat eo",
+    "Cancel": "Nullañ"
 }
 L.registerLocale("br", locale)
 L.setLocale("br")

umap/static/umap/locale/br.json

@@ -426,15 +426,15 @@
     "Filters keys": "Filters keys",
     "Filter data": "Roadennoù ar sil",
     "Search map features…": "Klask perzhioù ar gartenn..",
-    "Reset all": "Reset all",
-    "Open browser": "Open browser",
+    "Reset all": "Adlakaat pep tra",
+    "Open browser": "Digeriñ ar merdeer",
     "Open caption": "Open caption",
     "Your map has been created with an anonymous account!": "Your map has been created with an anonymous account!",
     "Real-time collaboration": "Real-time collaboration",
-    "Cannot parse data": "Cannot parse data",
-    "Start typing...": "Start typing...",
-    "No result": "No result",
-    "Data browser": "Data browser",
+    "Cannot parse data": "N'haller ket dielfennañ ar roadennoù",
+    "Start typing...": "Krogit da skrivañ...",
+    "No result": "Disoc'h ebet",
+    "Data browser": "Furchal ar roadennoù",
     "When providing an URL, uMap can copy the remote data in a layer, or add this URL as remote source of the layer. In that case, data will always be fetched from that URL, and thus be up to date, but it will not be possible to edit it inside uMap.": "When providing an URL, uMap can copy the remote data in a layer, or add this URL as remote source of the layer. In that case, data will always be fetched from that URL, and thus be up to date, but it will not be possible to edit it inside uMap.",
     "Overpass supported expressions": "Overpass supported expressions",
     "key (eg. building)": "key (eg. building)",
@@ -445,25 +445,25 @@
     "key=\"value|value2\" (eg. name=\"Paris|Berlin\")": "key=\"value|value2\" (eg. name=\"Paris|Berlin\")",
     "More info about Overpass syntax": "More info about Overpass syntax",
     "For more complex needs, see": "For more complex needs, see",
-    "Choose data": "Choose data",
+    "Choose data": "Dibab ar roadennoù",
     "Import helpers:": "Import helpers:",
-    "Choose the format": "Choose the format",
-    "Choose the layer": "Choose the layer",
-    "Layer name": "Layer name",
+    "Choose the format": "Dibab ar furmad",
+    "Choose the layer": "Dibab ar gwiskad",
+    "Layer name": "Anv ar gwiskad",
     "Choose import mode": "Choose import mode",
-    "Copy into the layer": "Copy into the layer",
+    "Copy into the layer": "Eilañ e-barzh ar gwiskad",
     "Link to the layer as remote data": "Link to the layer as remote data",
     "Condition": "Condition",
-    "key=value or key!=value": "key=value or key!=value",
-    "Are you sure you want to delete this rule?": "Are you sure you want to delete this rule?",
-    "empty rule": "empty rule",
+    "key=value or key!=value": "key=value pe key!=value",
+    "Are you sure you want to delete this rule?": "Ha sur oc'h e faot deoc'h dilemel ar reolenn-mañ?",
+    "empty rule": "Reolenn goullo",
     "Conditional style rules": "Conditional style rules",
-    "Add rule": "Add rule",
-    "Browser: data": "Browser: data",
-    "Browser: layers": "Browser: layers",
-    "Browser: filters": "Browser: filters",
+    "Add rule": "Ouzhpennañ ur reolenn",
+    "Browser: data": "Merdeer: roadennoù",
+    "Browser: layers": "Merdeer: gwiskadoù",
+    "Browser: filters": "Merdeer: siloù",
     "Enable real-time collaboration": "Enable real-time collaboration",
-    "✅ Copied!": "✅ Copied!",
+    "✅ Copied!": "✅ Eilet !",
     "Choose a dataset": "Choose a dataset",
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
@@ -473,30 +473,30 @@
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
     "Expression": "Expression",
-    "Geometry mode": "Geometry mode",
+    "Geometry mode": "Mod mentoniezh",
     "Only geometry centers": "Only geometry centers",
     "Search area": "Search area",
     "Type area name, or let empty to load data in current map view": "Type area name, or let empty to load data in current map view",
-    "Data successfully imported!": "Data successfully imported!",
-    "My Dashboard ({username})": "My Dashboard ({username})",
-    "Clear data": "Clear data",
-    "Remove layers": "Remove layers",
-    "Categorized": "Categorized",
-    "Alphabetical": "Alphabetical",
-    "Category property": "Category property",
+    "Data successfully imported!": "Roadennoù enporzhiet gant berzh!",
+    "My Dashboard ({username})": "Ma Zaolenn-vourzh ({username})",
+    "Clear data": "Skarzhañ ar roadennoù",
+    "Remove layers": "Lemel ar gwiskadoù",
+    "Categorized": "Dre rummad",
+    "Alphabetical": "Urzh al lizherenneg",
+    "Category property": "Perzh",
     "Color palette": "Color palette",
-    "Categories": "Categories",
+    "Categories": "Rummadoù",
     "Comma separated list of categories.": "Comma separated list of categories.",
     "Categories mode": "Categories mode",
     "Remove filter for this column": "Remove filter for this column",
     "Add filter for this column": "Add filter for this column",
-    "Rename this column": "Rename this column",
-    "Delete this column": "Delete this column",
-    "Name “{name}” should not contain a dot.": "Name “{name}” should not contain a dot.",
-    "This name already exists: “{name}”": "This name already exists: “{name}”",
-    "Delete selected rows": "Delete selected rows",
+    "Rename this column": "Adenvel ar bann-mañ",
+    "Delete this column": "Dilemel ar bann-mañ",
+    "Name “{name}” should not contain a dot.": "Ne rankfe ket bout ur pik e-barzh an anv “{name}”.",
+    "This name already exists: “{name}”": "Bout 'zo an anv-se dija:  “{name}”",
+    "Delete selected rows": "Dilemel al linennoù diuzet",
     "Found {count} rows. Are you sure you want to delete all?": "Found {count} rows. Are you sure you want to delete all?",
     "Expression is empty": "Expression is empty",
-    "OK": "OK",
-    "Cancel": "Cancel"
+    "OK": "Mat eo",
+    "Cancel": "Nullañ"
 }