umap-project 2.2.1__py3-none-any.whl → 2.3.0__py3-none-any.whl

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

@@ -196,8 +196,11 @@ U.ToggleEditAction = U.BaseFeatureAction.extend({
   },
 
   onClick: function (e) {
-    if (this.feature._toggleEditing) this.feature._toggleEditing(e) // Path
-    else this.feature.edit(e) // Marker
+    if (this.feature._toggleEditing) {
+      this.feature._toggleEditing(e) // Path
+    } else {
+      this.feature.edit(e) // Marker
+    }
   },
 })
 
@@ -496,8 +499,11 @@ L.Control.Button = L.Control.extend({
       this
     )
     L.DomEvent.on(button, 'dblclick', L.DomEvent.stopPropagation)
+    this.afterAdd(container)
     return container
   },
+
+  afterAdd: function (container) {},
 })
 
 U.DataLayersControl = L.Control.Button.extend({
@@ -507,6 +513,10 @@ U.DataLayersControl = L.Control.Button.extend({
     title: L._('See layers'),
   },
 
+  afterAdd: function (container) {
+    U.Utils.toggleBadge(container, this.map.browser.hasFilters())
+  },
+
   onClick: function () {
     this.map.openBrowser()
   },
@@ -660,15 +670,11 @@ const ControlsMixin = {
     'star',
     'tilelayers',
   ],
-  _openFacet: function () {
-    this.facets.open()
-  },
 
   displayCaption: function () {
     const container = L.DomUtil.create('div', 'umap-caption')
     L.DomUtil.createTitle(container, this.options.name, 'icon-caption')
     this.permissions.addOwnerLink('h5', container)
-    this.browser.tabsMenu(container, 'info')
     if (this.options.description) {
       const description = L.DomUtil.element({
         tagName: 'div',
@@ -1255,7 +1261,7 @@ U.SearchControl = L.Control.extend({
       this.map.fire('dataload', { id: id })
     })
     this.search.resultsContainer = resultsContainer
-    this.map.panel.open({ content: container }).then(input.focus)
+    this.map.panel.open({ content: container }).then(input.focus())
   },
 })
 
@@ -1316,16 +1322,14 @@ U.ContextMenu = L.Map.ContextMenu.extend({
 U.Editable = L.Editable.extend({
   initialize: function (map, options) {
     L.Editable.prototype.initialize.call(this, map, options)
-    this.on(
-      'editable:drawing:start editable:drawing:click editable:drawing:move',
-      this.drawingTooltip
-    )
+    this.on('editable:drawing:click editable:drawing:move', this.drawingTooltip)
     this.on('editable:drawing:end', (e) => {
       this.closeTooltip()
       // Leaflet.Editable will delete the drawn shape if invalid
       // (eg. line has only one drawn point)
       // So let's check if the layer has no more shape
       if (!e.layer.hasGeom()) e.layer.del()
+      else e.layer.edit()
     })
     // Layer for items added by users
     this.on('editable:drawing:cancel', (e) => {

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

@@ -81,24 +81,26 @@ L.DomUtil.add = (tagName, className, container, content) => {
 
 L.DomUtil.createFieldset = (container, legend, options) => {
   options = options || {}
-  const fieldset = L.DomUtil.create('div', 'fieldset toggle', container)
-  const legendEl = L.DomUtil.add('h5', 'legend style_options_toggle', fieldset, legend)
-  const fieldsEl = L.DomUtil.add('div', 'fields with-transition', fieldset)
-  L.DomEvent.on(legendEl, 'click', function () {
-    if (L.DomUtil.hasClass(fieldset, 'on')) {
-      L.DomUtil.removeClass(fieldset, 'on')
-    } else {
-      L.DomUtil.addClass(fieldset, 'on')
-      if (options.callback) options.callback.call(options.context || this)
-    }
-  })
-  return fieldsEl
+  const details = L.DomUtil.create('details', options.className || '', container)
+  const summary = L.DomUtil.add('summary', '', details)
+  if (options.icon) L.DomUtil.createIcon(summary, options.icon)
+  L.DomUtil.add('span', '', summary, legend)
+  const fieldset = L.DomUtil.add('fieldset', '', details)
+  details.open = options.on === true
+  if (options.callback) {
+    L.DomEvent.on(details, 'toggle', () => {
+      if (details.open) options.callback.call(options.context || this)
+    })
+  }
+  return fieldset
 }
 
 L.DomUtil.createButton = (className, container, content, callback, context) => {
   const el = L.DomUtil.add('button', className, container, content)
   el.type = 'button'
-  el.title = content
+  if (!content.nodeType) {
+    el.title = content
+  }
   if (callback) {
     L.DomEvent.on(el, 'click', L.DomEvent.stop).on(el, 'click', callback, context)
   }
@@ -554,9 +556,9 @@ U.Help = L.Class.extend({
     'Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.'
   ),
   slugKey: L._('The name of the property to use as feature unique identifier.'),
-  filterKey: L._('Comma separated list of properties to use when filtering features'),
+  filterKey: L._('Comma separated list of properties to use when filtering features by text input'),
   facetKey: L._(
-    'Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.'
+    'Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.'
   ),
   interactive: L._(
     'If false, the polygon or line will act as a part of the underlying map.'

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

@@ -494,6 +494,14 @@ U.FeatureMixin = {
       this.bindTooltip(U.Utils.escapeHTML(displayName), options)
   },
 
+  isFiltered: function () {
+    const filterKeys = this.map.getFilterKeys()
+    const filter = this.map.browser.options.filter
+    if (filter && !this.matchFilter(filter, filterKeys)) return true
+    if (!this.matchFacets()) return true
+    return false
+  },
+
   matchFilter: function (filter, keys) {
     filter = filter.toLowerCase()
     for (let i = 0, value; i < keys.length; i++) {
@@ -513,8 +521,6 @@ U.FeatureMixin = {
         case 'date':
         case 'datetime':
         case 'number':
-          min = parser(min)
-          max = parser(max)
           if (!isNaN(min) && !isNaN(value) && min > value) return false
           if (!isNaN(max) && !isNaN(value) && max < value) return false
           break

umap/static/umap/js/umap.forms.js

@@ -744,7 +744,17 @@ L.FormBuilder.Switch = L.FormBuilder.CheckBox.extend({
   },
 })
 
-L.FormBuilder.FacetSearchChoices = L.FormBuilder.Element.extend({
+L.FormBuilder.FacetSearchBase = L.FormBuilder.Element.extend({
+
+  buildLabel: function () {
+    this.label = L.DomUtil.element({
+      tagName: 'legend',
+      textContent: this.options.label,
+    })
+  }
+
+})
+L.FormBuilder.FacetSearchChoices = L.FormBuilder.FacetSearchBase.extend({
   build: function () {
     this.container = L.DomUtil.create('fieldset', 'umap-facet', this.parentNode)
     this.container.appendChild(this.label)
@@ -756,13 +766,6 @@ L.FormBuilder.FacetSearchChoices = L.FormBuilder.Element.extend({
     choices.forEach((value) => this.buildLi(value))
   },
 
-  buildLabel: function () {
-    this.label = L.DomUtil.element({
-      tagName: 'legend',
-      textContent: this.options.label,
-    })
-  },
-
   buildLi: function (value) {
     const property_li = L.DomUtil.create('li', '', this.ul)
     const label = L.DomUtil.create('label', '', property_li)
@@ -787,7 +790,7 @@ L.FormBuilder.FacetSearchChoices = L.FormBuilder.Element.extend({
   },
 })
 
-L.FormBuilder.MinMaxBase = L.FormBuilder.Element.extend({
+L.FormBuilder.MinMaxBase = L.FormBuilder.FacetSearchBase.extend({
   getInputType: function (type) {
     return type
   },
@@ -796,7 +799,7 @@ L.FormBuilder.MinMaxBase = L.FormBuilder.Element.extend({
     return [L._('Min'), L._('Max')]
   },
 
-  castValue: function (value) {
+  prepareForHTML: function (value) {
     return value.valueOf()
   },
 
@@ -804,6 +807,10 @@ L.FormBuilder.MinMaxBase = L.FormBuilder.Element.extend({
     this.container = L.DomUtil.create('fieldset', 'umap-facet', this.parentNode)
     this.container.appendChild(this.label)
     const { min, max, type } = this.options.criteria
+    const { min: modifiedMin, max: modifiedMax } = this.get()
+
+    const currentMin = modifiedMin !== undefined ? modifiedMin : min
+    const currentMax = modifiedMax !== undefined ? modifiedMax : max
     this.type = type
     this.inputType = this.getInputType(this.type)
 
@@ -815,9 +822,17 @@ L.FormBuilder.MinMaxBase = L.FormBuilder.Element.extend({
     this.minInput = L.DomUtil.create('input', '', this.minLabel)
     this.minInput.type = this.inputType
     this.minInput.step = 'any'
+    this.minInput.min = this.prepareForHTML(min)
+    this.minInput.max = this.prepareForHTML(max)
     if (min != null) {
-      this.minInput.valueAsNumber = this.castValue(min)
-      this.minInput.dataset.value = min
+      // The value stored using setAttribute is not modified by
+      // user input, and will be used as initial value when calling
+      // form.reset(), and can also be retrieve later on by using
+      // getAttributing, to compare with current value and know
+      // if this value has been modified by the user
+      // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/reset
+      this.minInput.setAttribute('value', this.prepareForHTML(min))
+      this.minInput.value = this.prepareForHTML(currentMin)
     }
 
     this.maxLabel = L.DomUtil.create('label', '', this.container)
@@ -826,37 +841,76 @@ L.FormBuilder.MinMaxBase = L.FormBuilder.Element.extend({
     this.maxInput = L.DomUtil.create('input', '', this.maxLabel)
     this.maxInput.type = this.inputType
     this.maxInput.step = 'any'
+    this.maxInput.min = this.prepareForHTML(min)
+    this.maxInput.max = this.prepareForHTML(max)
     if (max != null) {
-      this.maxInput.valueAsNumber = this.castValue(max)
-      this.maxInput.dataset.value = max
+      // Cf comment above about setAttribute vs value
+      this.maxInput.setAttribute('value', this.prepareForHTML(max))
+      this.maxInput.value = this.prepareForHTML(currentMax)
     }
+    this.toggleStatus()
 
-    L.DomEvent.on(this.minInput, 'change', (e) => this.sync())
-    L.DomEvent.on(this.maxInput, 'change', (e) => this.sync())
+    L.DomEvent.on(this.minInput, 'change', () => this.sync())
+    L.DomEvent.on(this.maxInput, 'change', () => this.sync())
   },
 
-  buildLabel: function () {
-    this.label = L.DomUtil.element({
-      tagName: 'legend',
-      textContent: this.options.label,
-    })
+  toggleStatus: function () {
+    this.minInput.dataset.modified = this.isMinModified()
+    this.maxInput.dataset.modified = this.isMaxModified()
+  },
+
+  sync: function () {
+    L.FormBuilder.Element.prototype.sync.call(this)
+    this.toggleStatus()
+  },
+
+  isMinModified: function () {
+    const default_ = this.minInput.getAttribute("value")
+    const current = this.minInput.value
+    return current != default_
+  },
+
+  isMaxModified: function () {
+    const default_ = this.maxInput.getAttribute("value")
+    const current = this.maxInput.value
+    return current != default_
   },
 
   toJS: function () {
-    return {
+    const opts = {
       type: this.type,
-      min: this.minInput.value,
-      max: this.maxInput.value,
     }
+    if (this.minInput.value !== '' && this.isMinModified()) {
+      opts.min = this.prepareForJS(this.minInput.value)
+    }
+    if (this.maxInput.value !== '' && this.isMaxModified()) {
+      opts.max = this.prepareForJS(this.maxInput.value)
+    }
+    return opts
   },
 })
 
-L.FormBuilder.FacetSearchNumber = L.FormBuilder.MinMaxBase.extend({})
+L.FormBuilder.FacetSearchNumber = L.FormBuilder.MinMaxBase.extend({
+  prepareForJS: function (value) {
+    return new Number(value)
+  },
+})
 
 L.FormBuilder.FacetSearchDate = L.FormBuilder.MinMaxBase.extend({
-  castValue: function (value) {
-    return value.valueOf() - value.getTimezoneOffset() * 60000
+  prepareForJS: function (value) {
+    return new Date(value)
+  },
+
+  toLocaleDateTime: function (dt) {
+    return new Date(dt.valueOf() - dt.getTimezoneOffset() * 60000)
+  },
+
+  prepareForHTML: function (value) {
+    // Value must be in local time
+    if (isNaN(value)) return
+    return this.toLocaleDateTime(value).toISOString().substr(0, 10)
   },
+
   getLabels: function () {
     return [L._('From'), L._('Until')]
   },
@@ -866,6 +920,12 @@ L.FormBuilder.FacetSearchDateTime = L.FormBuilder.FacetSearchDate.extend({
   getInputType: function (type) {
     return 'datetime-local'
   },
+
+  prepareForHTML: function (value) {
+    // Value must be in local time
+    if (isNaN(value)) return
+    return this.toLocaleDateTime(value).toISOString().slice(0, -1)
+  },
 })
 
 L.FormBuilder.MultiChoice = L.FormBuilder.Element.extend({
@@ -878,12 +938,11 @@ L.FormBuilder.MultiChoice = L.FormBuilder.Element.extend({
   },
 
   fetch: function () {
-    let value = (this.backup = this.toHTML())
-    if (!this.container.querySelector(`input[type="radio"][value="${value}"]`))
-      value =
-        typeof this.options.default !== 'undefined'
-          ? this.options.default
-          : this.default
+    this.backup = this.toHTML()
+    let value = this.backup
+    if (!this.container.querySelector(`input[type="radio"][value="${value}"]`)) {
+      value = this.options.default !== undefined ? this.options.default : this.default
+    }
     this.container.querySelector(`input[type="radio"][value="${value}"]`).checked = true
   },
 

umap/static/umap/js/umap.js

@@ -149,6 +149,9 @@ U.Map = L.Map.extend({
     if (this.options.datalayersControl === 'expanded') {
       this.options.onLoadPanel = 'datalayers'
     }
+    if (this.options.onLoadPanel === 'facet') {
+      this.options.onLoadPanel = 'datafilters'
+    }
 
     let isDirty = false // self status
     try {
@@ -211,15 +214,15 @@ U.Map = L.Map.extend({
       if (L.Util.queryString('share')) {
         this.share.open()
       } else if (this.options.onLoadPanel === 'databrowser') {
-        this.openBrowser('expanded')
+        this.openBrowser('data')
       } else if (this.options.onLoadPanel === 'datalayers') {
-        this.openBrowser('condensed')
+        this.openBrowser('layers')
+      } else if (this.options.onLoadPanel === 'datafilters') {
+        this.panel.mode = 'expanded'
+        this.openBrowser('filters')
       } else if (this.options.onLoadPanel === 'caption') {
         this.panel.mode = 'condensed'
         this.displayCaption()
-      } else if (['facet', 'datafilters'].includes(this.options.onLoadPanel)) {
-        this.panel.mode = 'expanded'
-        this.openFacet()
       }
       if (L.Util.queryString('edit')) {
         if (this.hasEditMode()) this.enableEdit()
@@ -252,7 +255,7 @@ U.Map = L.Map.extend({
           this.initCaptionBar()
           this.renderEditToolbar()
           this.renderControls()
-          this.facets.redraw()
+          this.browser.redraw()
           break
         case 'data':
           this.redrawVisibleDataLayers()
@@ -908,15 +911,8 @@ U.Map = L.Map.extend({
   },
 
   openBrowser: function (mode) {
-    if (mode) this.panel.mode = mode
     this.onceDatalayersLoaded(function () {
-      this.browser.open()
-    })
-  },
-
-  openFacet: function () {
-    this.onceDataLoaded(function () {
-      this._openFacet()
+      this.browser.open(mode)
     })
   },
 
@@ -1229,7 +1225,7 @@ U.Map = L.Map.extend({
           handler: 'Input',
           helpEntries: 'filterKey',
           placeholder: L._('Default: name'),
-          label: L._('Filter keys'),
+          label: L._('Search keys'),
           inheritable: true,
         },
       ],
@@ -1239,7 +1235,7 @@ U.Map = L.Map.extend({
           handler: 'BlurInput',
           helpEntries: 'facetKey',
           placeholder: L._('Example: key1,key2|Label 2,key3|Label 3|checkbox'),
-          label: L._('Facet keys'),
+          label: L._('Filters keys'),
         },
       ],
       [
@@ -1602,15 +1598,14 @@ U.Map = L.Map.extend({
         'umap-open-browser-link flat',
         container,
         L._('Browse data'),
-        () => this.openBrowser('expanded')
+        () => this.openBrowser('data')
       )
       if (this.options.facetKey) {
         L.DomUtil.createButton(
           'umap-open-filter-link flat',
           container,
-          L._('Select data'),
-          this.openFacet,
-          this
+          L._('Filter data'),
+          () => this.openBrowser('filters')
         )
       }
     }
@@ -1747,17 +1742,17 @@ U.Map = L.Map.extend({
       '-',
       {
         text: L._('See layers'),
-        callback: () => this.openBrowser('condensed'),
+        callback: () => this.openBrowser('layers'),
       },
       {
         text: L._('Browse data'),
-        callback: () => this.openBrowser('expanded'),
+        callback: () => this.openBrowser('data'),
       }
     )
     if (this.options.facetKey) {
       items.push({
-        text: L._('Facet search'),
-        callback: this.openFacet,
+        text: L._('Filter data'),
+        callback: () => this.openBrowser('filters'),
       })
     }
     items.push(

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

@@ -463,8 +463,8 @@ U.Layer.Heat = L.HeatLayer.extend({
         this._latlngs[i].alt !== undefined
           ? this._latlngs[i].alt
           : this._latlngs[i][2] !== undefined
-          ? +this._latlngs[i][2]
-          : 1
+            ? +this._latlngs[i][2]
+            : 1
 
       grid[y] = grid[y] || []
       cell = grid[y][x]
@@ -875,10 +875,7 @@ U.DataLayer = L.Evented.extend({
   },
 
   showFeature: function (feature) {
-    const filterKeys = this.map.getFilterKeys(),
-      filter = this.map.browser.options.filter
-    if (filter && !feature.matchFilter(filter, filterKeys)) return
-    if (!feature.matchFacets()) return
+    if (feature.isFiltered()) return
     this.layer.addLayer(feature)
   },
 

umap/static/umap/locale/am_ET.js

@@ -83,7 +83,6 @@ const locale = {
     "color": "ከለር",
     "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.",
     "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.": "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.",
-    "Comma separated list of properties to use when filtering features": "ፊቸሮችን በሚያጣሩበት ጊዜ ሊጠቀሙ የሚችሏቸው በኮማ የተከፋፈሉ የባህርያት ዝርዝር",
     "Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.": "በኮማ፣ታብ፣ግማሽኮለን የተከፋፈሉ ውጤቶች። SRSWG84 ተመላክቷል። የነጥብ ጂኦሜትሪዎች ብቻ መጥተዋል። የማምጣት ሂደቱ የኮለምን ሄደሮችን በማሰስ «ላቲትዩድ» እና «ሎንጊትዩድ» የሚሉትን ቃላት መኖር ከመጀመሪያው በመነሳት ያጣራል። ሁሉም ኮለምኖች እንደባህርይ መጥተዋል።",
     "Congratulations, your map has been created!": "Congratulations, your map has been created!",
     "Continue line": "መስመሩን ቀጥል",
@@ -96,7 +95,6 @@ const locale = {
     "Custom background": "የተስተካከለ ጀርባ",
     "Custom overlay": "Custom overlay",
     "dash array": "ዳሽ አሬይ",
-    "Data browser": "የመረጃ ማሰሻ",
     "Data is browsable": "Data is browsable",
     "Datalayers": "Datalayers",
     "Default interaction options": "Default interaction options",
@@ -165,16 +163,12 @@ const locale = {
     "Exit Fullscreen": "Exit Fullscreen",
     "expanded": "expanded",
     "Extract shape to separate feature": "ፊቸሩን ለመለየት ቅርፁን ነጥለህ አውጣ",
-    "Facet keys": "Facet keys",
-    "Facet search": "Facet search",
     "Feature identifier key": "Feature identifier key",
     "Feature properties": "Feature properties",
     "Fetch data each time map view changes.": "Fetch data each time map view changes.",
     "fill color": "ከለር ሙላ",
     "fill opacity": "ኦፓሲቲውን ሙላ",
     "fill": "ሙላ",
-    "Filter keys": "Filter keys",
-    "Filter": "Filter",
     "Fit all data": "Fit all data",
     "Format": "ፎርማት",
     "From zoom": "ከዙም",
@@ -267,7 +261,6 @@ const locale = {
     "NM": "NM",
     "No cache": "No cache",
     "No licence has been set": "ምንም ፈቃድ አልተሰጠም",
-    "No results for these facets": "No results for these facets",
     "No results": "No results",
     "no": "አይደለም",
     "No.": "No.",
@@ -332,7 +325,6 @@ const locale = {
     "See layers": "See layers",
     "See full screen": "ሙሉውን ስክሪን ተመልከት",
     "See on OpenStreetMap": "See on OpenStreetMap",
-    "Select data": "Select data",
     "Send me the link": "Send me the link",
     "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…",
     "settings": "settings",
@@ -434,9 +426,7 @@ const locale = {
     "Edit map details": "Edit map details",
     "Back to browser": "Back to browser",
     "Toggle size": "Toggle size",
-    "Layers": "Layers",
     "Display the caption control": "Display the caption control",
-    "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.",
     "<empty value>": "<empty value>",
     "Min": "Min",
     "Max": "Max",
@@ -446,8 +436,17 @@ const locale = {
     "Edit in OpenStreetMap": "Edit in OpenStreetMap",
     "Cannot determine latitude and longitude columns.": "Cannot determine latitude and longitude columns.",
     "Back to layers": "Back to layers",
-    "Data": "Data",
-    "Filters": "Filters"
+    "Filters": "Filters",
+    "Comma separated list of properties to use when filtering features by text input": "Comma separated list of properties to use when filtering features by text input",
+    "Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.": "Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.",
+    "Search keys": "Search keys",
+    "Filters keys": "Filters keys",
+    "Filter data": "Filter data",
+    "Search map features…": "Search map features…",
+    "Reset all": "Reset all",
+    "Browser in data mode": "Browser in data mode",
+    "Browser in layers mode": "Browser in layers mode",
+    "Browser in filters mode": "Browser in filters mode"
 }
 L.registerLocale("am_ET", locale)
 L.setLocale("am_ET")

umap/static/umap/locale/am_ET.json

@@ -83,7 +83,6 @@
     "color": "ከለር",
     "Comma separated list of numbers, including min and max values.": "Comma separated list of numbers, including min and max values.",
     "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.": "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.",
-    "Comma separated list of properties to use when filtering features": "ፊቸሮችን በሚያጣሩበት ጊዜ ሊጠቀሙ የሚችሏቸው በኮማ የተከፋፈሉ የባህርያት ዝርዝር",
     "Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.": "በኮማ፣ታብ፣ግማሽኮለን የተከፋፈሉ ውጤቶች። SRSWG84 ተመላክቷል። የነጥብ ጂኦሜትሪዎች ብቻ መጥተዋል። የማምጣት ሂደቱ የኮለምን ሄደሮችን በማሰስ «ላቲትዩድ» እና «ሎንጊትዩድ» የሚሉትን ቃላት መኖር ከመጀመሪያው በመነሳት ያጣራል። ሁሉም ኮለምኖች እንደባህርይ መጥተዋል።",
     "Congratulations, your map has been created!": "Congratulations, your map has been created!",
     "Continue line": "መስመሩን ቀጥል",
@@ -96,7 +95,6 @@
     "Custom background": "የተስተካከለ ጀርባ",
     "Custom overlay": "Custom overlay",
     "dash array": "ዳሽ አሬይ",
-    "Data browser": "የመረጃ ማሰሻ",
     "Data is browsable": "Data is browsable",
     "Datalayers": "Datalayers",
     "Default interaction options": "Default interaction options",
@@ -165,16 +163,12 @@
     "Exit Fullscreen": "Exit Fullscreen",
     "expanded": "expanded",
     "Extract shape to separate feature": "ፊቸሩን ለመለየት ቅርፁን ነጥለህ አውጣ",
-    "Facet keys": "Facet keys",
-    "Facet search": "Facet search",
     "Feature identifier key": "Feature identifier key",
     "Feature properties": "Feature properties",
     "Fetch data each time map view changes.": "Fetch data each time map view changes.",
     "fill color": "ከለር ሙላ",
     "fill opacity": "ኦፓሲቲውን ሙላ",
     "fill": "ሙላ",
-    "Filter keys": "Filter keys",
-    "Filter": "Filter",
     "Fit all data": "Fit all data",
     "Format": "ፎርማት",
     "From zoom": "ከዙም",
@@ -267,7 +261,6 @@
     "NM": "NM",
     "No cache": "No cache",
     "No licence has been set": "ምንም ፈቃድ አልተሰጠም",
-    "No results for these facets": "No results for these facets",
     "No results": "No results",
     "no": "አይደለም",
     "No.": "No.",
@@ -332,7 +325,6 @@
     "See layers": "See layers",
     "See full screen": "ሙሉውን ስክሪን ተመልከት",
     "See on OpenStreetMap": "See on OpenStreetMap",
-    "Select data": "Select data",
     "Send me the link": "Send me the link",
     "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…",
     "settings": "settings",
@@ -434,9 +426,7 @@
     "Edit map details": "Edit map details",
     "Back to browser": "Back to browser",
     "Toggle size": "Toggle size",
-    "Layers": "Layers",
     "Display the caption control": "Display the caption control",
-    "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.",
     "<empty value>": "<empty value>",
     "Min": "Min",
     "Max": "Max",
@@ -446,6 +436,15 @@
     "Edit in OpenStreetMap": "Edit in OpenStreetMap",
     "Cannot determine latitude and longitude columns.": "Cannot determine latitude and longitude columns.",
     "Back to layers": "Back to layers",
-    "Data": "Data",
-    "Filters": "Filters"
+    "Filters": "Filters",
+    "Comma separated list of properties to use when filtering features by text input": "Comma separated list of properties to use when filtering features by text input",
+    "Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.": "Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.",
+    "Search keys": "Search keys",
+    "Filters keys": "Filters keys",
+    "Filter data": "Filter data",
+    "Search map features…": "Search map features…",
+    "Reset all": "Reset all",
+    "Browser in data mode": "Browser in data mode",
+    "Browser in layers mode": "Browser in layers mode",
+    "Browser in filters mode": "Browser in filters mode"
 }