umap-project 2.4.0b1__py3-none-any.whl → 2.4.1__py3-none-any.whl

umap/static/umap/img/source/16-white.svg

@@ -16,7 +16,7 @@
       <path d="M 16.0401,2.3158 H 2.005 v 14.0351 h 14.0351 z" fill="#ffffff" id="path1259" />
     </mask>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="25.599967" inkscape:cx="37.558642" inkscape:cy="19.121119" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1011" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" inkscape:snap-grids="true" inkscape:snap-to-guides="true" inkscape:showpageshadow="2" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="10.391897" inkscape:cx="112.73207" inkscape:cy="34.401804" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1011" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" inkscape:snap-grids="true" inkscape:snap-to-guides="true" inkscape:showpageshadow="2" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1">
     <inkscape:grid type="xygrid" id="grid3004" empspacing="4" visible="true" enabled="true" snapvisiblegridlinesonly="true" originx="0" originy="0" spacingy="1" spacingx="1" units="px" />
     <sodipodi:guide orientation="-1,0" position="24,168" id="guide3084" inkscape:locked="false" inkscape:label="" inkscape:color="rgb(0,134,229)" />
     <sodipodi:guide orientation="0,1" position="0,96" id="guide3086" inkscape:locked="false" inkscape:label="" inkscape:color="rgb(0,134,229)" />
@@ -40,6 +40,7 @@
     </rdf:RDF>
   </metadata>
   <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-812.36218)">
+    <path style="fill:#f2f2f2;fill-opacity:1;stroke-width:0.25;paint-order:fill markers stroke;stroke:#999999;stroke-opacity:1" d="m 106.58891,43.849359 c -3.10089,-0.58252 -5.52944,-2.863466 -6.31937,-5.935298 -0.23482,-0.913171 -0.294235,-2.2415 -0.14177,-3.169542 0.51108,-3.110805 2.83364,-5.667956 5.86284,-6.455008 3.72982,-0.969088 7.59776,0.861664 9.2444,4.375508 0.52616,1.122793 0.76105,2.331963 0.7086,3.647677 -0.0496,1.245447 -0.28677,2.18265 -0.82249,3.250829 -1.04984,2.093266 -2.88939,3.559535 -5.24807,4.183141 -0.49134,0.129903 -0.73215,0.154443 -1.68896,0.172114 -0.81094,0.01498 -1.24691,-0.004 -1.59518,-0.06942 z m 2.43966,-5.8477 v -3.046165 h -1.02544 -1.02544 v 3.046165 3.046164 h 1.02544 1.02544 z m -0.53434,-4.563852 c 0.33094,-0.09915 0.70763,-0.444612 0.87372,-0.801282 0.4662,-1.001185 -0.2615,-2.144718 -1.36482,-2.144718 -0.44164,0 -0.73107,0.12392 -1.06527,0.456086 -0.42453,0.421956 -0.54914,0.937689 -0.37666,1.558908 0.0814,0.293275 0.60383,0.829099 0.89905,0.922151 0.28553,0.09 0.74987,0.09398 1.03398,0.0089 z" id="path6" transform="translate(0,812.36218)" />
     <text xml:space="preserve" style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" x="5.7867966" y="897.80786" id="text4457"><tspan y="897.80786" x="5.7867966" sodipodi:role="line" id="tspan4459" style="font-size:40px;line-height:1.25;font-family:sans-serif"> </tspan></text>
     <g id="g3001" transform="translate(-23.255701,-119.38651)">
       <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 35.255701,935.74851 c -4.412356,0 -8.00014,3.58778 -8.00014,8.00014 0,4.41235 3.587784,8.00014 8.00014,8.00014 4.412356,0 8.00014,-3.58779 8.00014,-8.00014 0,-4.41236 -3.587784,-8.00014 -8.00014,-8.00014 z m 0,1.00028 c 3.871916,0 6.99986,3.12794 6.99986,6.99986 0,3.87191 -3.127944,6.99986 -6.99986,6.99986 -3.871916,0 -6.999861,-3.12795 -6.999861,-6.99986 0,-3.87192 3.127945,-6.99986 6.999861,-6.99986 z" id="path3014" inkscape:connector-curvature="0" />
@@ -63,8 +64,6 @@
     </g>
     <path style="fill:#b3b3b3;fill-opacity:1;stroke:none" d="m 63.71429,890.36216 -1.14285,1.1428 2.28571,2.2858 L 66,892.64786 Z M 62,892.07646 55.714286,898.36218 58,900.64788 l 6.28572,-6.2857 z m -6.285714,6.28572 -1.714286,4 4,-1.7143 z" id="path3684-2" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccc" />
     <path inkscape:connector-curvature="0" id="table-5-8-8-6-1" style="fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 54,914.3622 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z m -2,2 v 1 h 1 v -1 z m 2,0 v 1 h 10 v -1 z" />
-    <circle style="fill:#f2f2f2;fill-opacity:1;stroke:#999999;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path3764" cx="108" cy="844.36218" r="1.5" />
-    <path style="fill:#f2f2f2;fill-opacity:1;stroke:#999999;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 107,847.36218 h 2 v 6 h -2 z" id="rect4274" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" />
     <g id="g4717" transform="translate(-54.789185,-114.477)">
       <path style="fill:#f2f2f2;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 141.26953,173.42383 -6.75586,2.67969 0.95313,6.3457 5.87109,3.12695 4.14844,-7.87305 z m -1.44726,2.48828 2.99023,1.60156 -0.5918,2.43164 -3.35742,1.50391 -1.73828,-3.81055 z" transform="translate(-1.210815,854.83918)" id="path3862" inkscape:connector-curvature="0" />
     </g>
@@ -139,7 +138,6 @@
         <path inkscape:connector-curvature="0" id="path4353-1-6-1-3-3-9-6" transform="matrix(1.9000195,0,0,1.9000195,-245.02393,606.04174)" d="m 222.11328,179.64258 -1.04883,1.04883 1.58203,1.58007 -1.58203,1.58204 1.04883,1.04687 1.58203,-1.58008 1.58008,1.58008 1.04883,-1.04687 -1.58203,-1.58204 1.58203,-1.58007 -1.04883,-1.04883 -1.58008,1.58008 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.81628;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       </g>
     </g>
-    <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 108,840.36204 c -4.41236,0 -8.00014,3.58778 -8.00014,8.00014 0,4.41235 3.58778,8.00014 8.00014,8.00014 4.41236,0 8.00014,-3.58779 8.00014,-8.00014 0,-4.41236 -3.58778,-8.00014 -8.00014,-8.00014 z m 0,1.00028 c 3.87192,0 6.99986,3.12794 6.99986,6.99986 0,3.87191 -3.12794,6.99986 -6.99986,6.99986 -3.87192,0 -6.99986,-3.12795 -6.99986,-6.99986 0,-3.87192 3.12794,-6.99986 6.99986,-6.99986 z" id="path3014-4" inkscape:connector-curvature="0" />
     <rect style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4237" width="2" height="2" x="77" y="889.36218" />
     <rect style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4239" width="2" height="2" x="81" y="889.36218" />
     <rect style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4241" width="2" height="2" x="85" y="889.36218" />

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

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

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

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

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

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

umap/static/umap/js/modules/importers/datasets.js

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

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

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

umap/static/umap/js/umap.features.js

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

umap/static/umap/js/umap.js

@@ -1,5 +1,5 @@
 L.Map.mergeOptions({
-  overlay: null,
+  overlay: {},
   datalayers: [],
   hash: true,
   maxZoomLimit: 24,
@@ -205,49 +205,9 @@ U.Map = L.Map.extend({
       this.editTools = new U.Editable(this)
       this.renderEditToolbar()
     }
-    if (!U.Utils.isObject(this.options.overlay)) {
-      this.options.overlay = {}
-    }
-    if (!U.Utils.isObject(this.options.tilelayer)) {
-      this.options.tilelayer = {}
-    }
 
     this.initShortcuts()
-    this.onceDataLoaded(function () {
-      const slug = L.Util.queryString('feature')
-      if (slug && this.features_index[slug]) this.features_index[slug].view()
-      if (this.options.noControl) return
-      this.initCaptionBar()
-      if (L.Util.queryString('share')) {
-        this.share.open()
-      } else if (this.options.onLoadPanel === 'databrowser') {
-        this.panel.setDefaultMode('expanded')
-        this.openBrowser('data')
-      } else if (this.options.onLoadPanel === 'datalayers') {
-        this.panel.setDefaultMode('condensed')
-        this.openBrowser('layers')
-      } else if (this.options.onLoadPanel === 'datafilters') {
-        this.panel.setDefaultMode('expanded')
-        this.openBrowser('filters')
-      } else if (this.options.onLoadPanel === 'caption') {
-        this.panel.setDefaultMode('condensed')
-        this.openCaption()
-      }
-      if (L.Util.queryString('edit')) {
-        if (this.hasEditMode()) this.enableEdit()
-        // Sometimes users share the ?edit link by mistake, let's remove
-        // this search parameter from URL to prevent this
-        const url = new URL(window.location)
-        url.searchParams.delete('edit')
-        history.pushState({}, '', url)
-      }
-      if (L.Util.queryString('download')) {
-        const download_url = this.urls.get('map_download', {
-          map_id: this.options.umap_id,
-        })
-        window.location = download_url
-      }
-    })
+    this.onceDataLoaded(this.setViewFromQueryString)
 
     window.onbeforeunload = () => (this.editEnabled && this.isDirty) || null
     this.backup()
@@ -341,6 +301,44 @@ U.Map = L.Map.extend({
     }
   },
 
+  setViewFromQueryString: function () {
+    if (this.options.noControl) return
+    this.initCaptionBar()
+    if (L.Util.queryString('share')) {
+      this.share.open()
+    } else if (this.options.onLoadPanel === 'databrowser') {
+      this.panel.setDefaultMode('expanded')
+      this.openBrowser('data')
+    } else if (this.options.onLoadPanel === 'datalayers') {
+      this.panel.setDefaultMode('condensed')
+      this.openBrowser('layers')
+    } else if (this.options.onLoadPanel === 'datafilters') {
+      this.panel.setDefaultMode('expanded')
+      this.openBrowser('filters')
+    } else if (this.options.onLoadPanel === 'caption') {
+      this.panel.setDefaultMode('condensed')
+      this.openCaption()
+    }
+    // Comes after default panels, so if it opens in a panel it will
+    // take precedence.
+    const slug = L.Util.queryString('feature')
+    if (slug && this.features_index[slug]) this.features_index[slug].view()
+    if (L.Util.queryString('edit')) {
+      if (this.hasEditMode()) this.enableEdit()
+      // Sometimes users share the ?edit link by mistake, let's remove
+      // this search parameter from URL to prevent this
+      const url = new URL(window.location)
+      url.searchParams.delete('edit')
+      history.pushState({}, '', url)
+    }
+    if (L.Util.queryString('download')) {
+      const download_url = this.urls.get('map_download', {
+        map_id: this.options.umap_id,
+      })
+      window.location = download_url
+    }
+  },
+
   // Merge the given schema with the default one
   // Missing keys inside the schema are merged with the default ones.
   overrideSchema: function (schema) {
@@ -1296,6 +1294,9 @@ U.Map = L.Map.extend({
   },
 
   _editTilelayer: function (container) {
+    if (!U.Utils.isObject(this.options.tilelayer)) {
+      this.options.tilelayer = {}
+    }
     const tilelayerFields = [
       [
         'options.tilelayer.name',
@@ -1343,6 +1344,9 @@ U.Map = L.Map.extend({
   },
 
   _editOverlay: function (container) {
+    if (!U.Utils.isObject(this.options.overlay)) {
+      this.options.overlay = {}
+    }
     const overlayFields = [
       [
         'options.overlay.url_template',
@@ -1535,8 +1539,7 @@ U.Map = L.Map.extend({
     const container = L.DomUtil.create('div', 'umap-edit-container')
     const metadataFields = ['options.name', 'options.description']
 
-    const title = L.DomUtil.create('h3', '', container)
-    title.textContent = L._('Edit map details')
+    L.DomUtil.createTitle(container, L._('Edit map details'), 'icon-caption')
     const builder = new U.FormBuilder(this, metadataFields, {
       className: 'map-metadata',
     })
@@ -1873,10 +1876,6 @@ U.Map = L.Map.extend({
     if (this._controls.search) this._controls.search.open()
   },
 
-  getFilterKeys: function () {
-    return (this.options.filterKey || this.options.sortKey || 'name').split(',')
-  },
-
   getLayersBounds: function () {
     const bounds = new L.latLngBounds()
     this.eachBrowsableDataLayer((d) => {

umap/static/umap/js/umap.layer.js

@@ -913,10 +913,10 @@ U.DataLayer = L.Evented.extend({
 
   removeLayer: function (feature) {
     const id = L.stamp(feature)
+    this.layer.removeLayer(feature)
     feature.disconnectFromDataLayer(this)
     this._index.splice(this._index.indexOf(id), 1)
     delete this._layers[id]
-    this.layer.removeLayer(feature)
     delete this.map.features_index[feature.getSlug()]
     if (this.hasDataLoaded()) this.fire('datachanged')
   },
@@ -1757,6 +1757,16 @@ U.DataLayer = L.Evented.extend({
     const editor = new U.TableEditor(this)
     editor.edit()
   },
+
+  getFilterKeys: function () {
+    // This keys will be used to filter feature from the browser text input.
+    // By default, it will we use the "name" property, which is also the one used as label in the features list.
+    // When map owner has configured another label or sort key, we try to be smart and search in the same keys.
+    if (this.map.options.filterKey) return this.map.options.filterKey
+    else if (this.options.labelKey) return this.options.labelKey
+    else if (this.map.options.sortKey) return this.map.options.sortKey
+    else return 'name'
+  },
 })
 
 L.TileLayer.include({

umap/static/umap/js/umap.popup.js

@@ -107,7 +107,7 @@ U.PopupTemplate.Default = L.Class.extend({
   renderBody: function () {
     const template = this.feature.getOption('popupContentTemplate')
     const target = this.feature.getOption('outlinkTarget')
-    const container = L.DomUtil.create('div', 'umap-popup-container')
+    const container = L.DomUtil.create('div', 'umap-popup-container text')
     let content = ''
     let properties
     let center

umap/static/umap/locale/en.js

@@ -481,7 +481,8 @@ const locale = {
     "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",
-    "Please define an expression for the query first": "Please define an expression for the query first"
+    "Please define an expression for the query first": "Please define an expression for the query first",
+    "Data successfully imported!": "Data successfully imported!"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

umap/static/umap/locale/en.json

@@ -481,5 +481,6 @@
     "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",
-    "Please define an expression for the query first": "Please define an expression for the query first"
+    "Please define an expression for the query first": "Please define an expression for the query first",
+    "Data successfully imported!": "Data successfully imported!"
 }

umap/static/umap/locale/es.js

@@ -12,13 +12,13 @@ const locale = {
     "5 min": "5 min",
     "A comma separated list of numbers that defines the stroke dash pattern. Ex.: \"5, 10, 15\".": "Una lista de números separados por comas que define el patrón de trazos. Por ejemplo: \"5, 10, 15\".",
     "About": "Acerca de",
-    "Action not allowed :(": "Action not allowed :(",
+    "Action not allowed :(": "Acción no permitida :(",
     "Activate slideshow mode": "Activar el modo presentación de diapositivas",
     "Add a layer": "Añadir una capa",
     "Add a line to the current multi": "Añadir una línea para el multi elemento actual",
     "Add a new property": "Añadir una nueva propiedad",
     "Add a polygon to the current multi": "Añadir un polígono al multi elemento actual",
-    "Add image URL": "Add image URL",
+    "Add image URL": "Añadir URL de la imagen",
     "Add": "Añadir",
     "Advanced actions": "Acciones avanzadas",
     "Advanced properties": "Propiedades avanzadas",
@@ -83,7 +83,7 @@ const locale = {
     "Congratulations, your map has been created!": "Enhorabuena, ¡su mapa ha sido creado!",
     "Continue line": "Línea continua",
     "Coordinates": "Coordenadas",
-    "copy": "copy",
+    "copy": "copiar",
     "Credits": "Créditos",
     "Current map view": "Current map view",
     "Current view instead of default map view?": "¿Vista actual en lugar de la vista del mapa predeterminada?",
@@ -185,7 +185,7 @@ const locale = {
     "icon opacity": "opacidad del icono",
     "Icon shape": "Forma de icono",
     "Icon symbol": "Símbolo del icono",
-    "If false, the polygon or line will act as a part of the underlying map.": "If false, the polygon or line will act as a part of the underlying map.",
+    "If false, the polygon or line will act as a part of the underlying map.": "Si está desactivado el polígono o la línea será como una parte del mapa subyacente.",
     "Iframe with custom height (in px): {{{http://iframe.url.com|height}}}": "Iframe con altura personalizada (en píxeles): {{{http://iframe.url.com|altura}}}",
     "Iframe with custom height and width (in px): {{{http://iframe.url.com|height*width}}}": "Iframe con alto y ancho (en px) personalizado: {{{http://iframe.url.com|height*width}}}",
     "iframe": "iframe",
@@ -305,7 +305,7 @@ const locale = {
     "Replace layer content": "Reemplaza el contenido de la capa",
     "Restore this version": "Restaurar esta versión",
     "Save current edits": "Guardar las ediciones actuales",
-    "Save map": "Save map",
+    "Save map": "Guardar el mapa",
     "Save this center and zoom": "Guardar este centrado y acercamiento",
     "Save this location as new feature": "Guardar esta ubicación como nuevo elemento",
     "Save": "Guardar",
@@ -344,7 +344,7 @@ const locale = {
     "Table": "Tabla",
     "Text color for the cluster label": "Color del texto para la etiqueta clúster",
     "Text formatting": "Formato de texto",
-    "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")",
+    "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "El nombre de la propiedad a utilizar como etiqueta de la característica (ej.: \"nombre\"). También puede utilizar propiedades entre llaves para utilizar más de una o mezclarlas con contenido estático (p. ej.: \"{nombre} en {lugar}\").",
     "The name of the property to use as feature unique identifier.": "El nombre de la propiedad a utilizar como identificador único del elemento.",
     "The zoom and center have been modified.": "Se han modificado el zoom y el centro.",
     "TMS format": "formato TMS",
@@ -409,7 +409,7 @@ const locale = {
     "{distance} NM": "{distancia} NM",
     "{distance} yd": "{distancia} yd",
     "Edit map name and caption": "Edit map name and caption",
-    "Map advanced properties": "Map advanced properties",
+    "Map advanced properties": "Propiedades avanzadas del mapa",
     "Edit map details": "Edit map details",
     "Back to browser": "Back to browser",
     "Toggle size": "Toggle size",
@@ -481,7 +481,8 @@ const locale = {
     "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",
-    "Please define an expression for the query first": "Please define an expression for the query first"
+    "Please define an expression for the query first": "Please define an expression for the query first",
+    "Data successfully imported!": "Data successfully imported!"
 }
 L.registerLocale("es", locale)
 L.setLocale("es")

umap/static/umap/locale/es.json

@@ -12,13 +12,13 @@
     "5 min": "5 min",
     "A comma separated list of numbers that defines the stroke dash pattern. Ex.: \"5, 10, 15\".": "Una lista de números separados por comas que define el patrón de trazos. Por ejemplo: \"5, 10, 15\".",
     "About": "Acerca de",
-    "Action not allowed :(": "Action not allowed :(",
+    "Action not allowed :(": "Acción no permitida :(",
     "Activate slideshow mode": "Activar el modo presentación de diapositivas",
     "Add a layer": "Añadir una capa",
     "Add a line to the current multi": "Añadir una línea para el multi elemento actual",
     "Add a new property": "Añadir una nueva propiedad",
     "Add a polygon to the current multi": "Añadir un polígono al multi elemento actual",
-    "Add image URL": "Add image URL",
+    "Add image URL": "Añadir URL de la imagen",
     "Add": "Añadir",
     "Advanced actions": "Acciones avanzadas",
     "Advanced properties": "Propiedades avanzadas",
@@ -83,7 +83,7 @@
     "Congratulations, your map has been created!": "Enhorabuena, ¡su mapa ha sido creado!",
     "Continue line": "Línea continua",
     "Coordinates": "Coordenadas",
-    "copy": "copy",
+    "copy": "copiar",
     "Credits": "Créditos",
     "Current map view": "Current map view",
     "Current view instead of default map view?": "¿Vista actual en lugar de la vista del mapa predeterminada?",
@@ -185,7 +185,7 @@
     "icon opacity": "opacidad del icono",
     "Icon shape": "Forma de icono",
     "Icon symbol": "Símbolo del icono",
-    "If false, the polygon or line will act as a part of the underlying map.": "If false, the polygon or line will act as a part of the underlying map.",
+    "If false, the polygon or line will act as a part of the underlying map.": "Si está desactivado el polígono o la línea será como una parte del mapa subyacente.",
     "Iframe with custom height (in px): {{{http://iframe.url.com|height}}}": "Iframe con altura personalizada (en píxeles): {{{http://iframe.url.com|altura}}}",
     "Iframe with custom height and width (in px): {{{http://iframe.url.com|height*width}}}": "Iframe con alto y ancho (en px) personalizado: {{{http://iframe.url.com|height*width}}}",
     "iframe": "iframe",
@@ -305,7 +305,7 @@
     "Replace layer content": "Reemplaza el contenido de la capa",
     "Restore this version": "Restaurar esta versión",
     "Save current edits": "Guardar las ediciones actuales",
-    "Save map": "Save map",
+    "Save map": "Guardar el mapa",
     "Save this center and zoom": "Guardar este centrado y acercamiento",
     "Save this location as new feature": "Guardar esta ubicación como nuevo elemento",
     "Save": "Guardar",
@@ -344,7 +344,7 @@
     "Table": "Tabla",
     "Text color for the cluster label": "Color del texto para la etiqueta clúster",
     "Text formatting": "Formato de texto",
-    "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")",
+    "The name of the property to use as feature label (eg.: \"nom\"). You can also use properties inside brackets to use more than one or mix with static content (eg.: \"{name} in {place}\")": "El nombre de la propiedad a utilizar como etiqueta de la característica (ej.: \"nombre\"). También puede utilizar propiedades entre llaves para utilizar más de una o mezclarlas con contenido estático (p. ej.: \"{nombre} en {lugar}\").",
     "The name of the property to use as feature unique identifier.": "El nombre de la propiedad a utilizar como identificador único del elemento.",
     "The zoom and center have been modified.": "Se han modificado el zoom y el centro.",
     "TMS format": "formato TMS",
@@ -409,7 +409,7 @@
     "{distance} NM": "{distancia} NM",
     "{distance} yd": "{distancia} yd",
     "Edit map name and caption": "Edit map name and caption",
-    "Map advanced properties": "Map advanced properties",
+    "Map advanced properties": "Propiedades avanzadas del mapa",
     "Edit map details": "Edit map details",
     "Back to browser": "Back to browser",
     "Toggle size": "Toggle size",
@@ -481,5 +481,6 @@
     "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",
-    "Please define an expression for the query first": "Please define an expression for the query first"
+    "Please define an expression for the query first": "Please define an expression for the query first",
+    "Data successfully imported!": "Data successfully imported!"
 }