umap-project 3.4.0b1__py3-none-any.whl → 3.4.2__py3-none-any.whl

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

@@ -1,8 +1,3 @@
-import {
-  DomUtil,
-  Util as LeafletUtil,
-  latLngBounds,
-} from '../../vendors/leaflet/leaflet-src.esm.js'
 import {
   uMapAlert as Alert,
   uMapAlertCreation as AlertCreation,
@@ -10,6 +5,7 @@ import {
 import Browser from './browser.js'
 import Caption from './caption.js'
 import { DataLayer } from './data/layer.js'
+import { Fields } from './data/fields.js'
 import { Filters, migrateLegacyFilters } from './filters.js'
 import { MutatingForm } from './form/builder.js'
 import { Formatter } from './formatter.js'
@@ -33,7 +29,7 @@ import Tooltip from './ui/tooltip.js'
 import URLs from './urls.js'
 import * as Utils from './utils.js'
 import * as DOMUtils from './domutils.js'
-import { DataLayerManager, FieldManager } from './managers.js'
+import { DataLayerManager } from './managers.js'
 import { Importer as OpenRouteService } from './importers/openrouteservice.js'
 
 export default class Umap {
@@ -133,7 +129,7 @@ export default class Umap {
     this.contextmenu = new ContextMenu()
     this.server = new ServerRequest()
     this.request = new Request()
-    this.fields = new FieldManager(this, this.dialog)
+    this.fields = new Fields(this, this.dialog)
     this.filters = new Filters(this, this)
     this.browser = new Browser(this, this._leafletMap)
     this.caption = new Caption(this, this._leafletMap)
@@ -260,15 +256,6 @@ export default class Umap {
     return window.self !== window.top
   }
 
-  get fieldKeys() {
-    return Array.from(
-      new Set([
-        ...this.fields.keys(),
-        ...this.datalayers.active().reduce((acc, dl) => acc.concat(dl.fieldKeys), []),
-      ])
-    )
-  }
-
   setPropertiesFromQueryString() {
     const asBoolean = (key) => {
       const value = this.searchParams.get(key)
@@ -389,6 +376,10 @@ export default class Umap {
   }
 
   hasFilters() {
+    return this.filters.size || this.datalayers.active().some((d) => d.filters.size)
+  }
+
+  hasActiveFilters() {
     return (
       this.filters.isActive() ||
       this.datalayers.active().some((d) => d.filters.isActive())
@@ -676,7 +667,7 @@ export default class Umap {
     const parent = this._leafletMap.getPane('overlayPane')
     const datalayers = Object.values(this.datalayers)
       .filter((datalayer) => !datalayer._isDeleted)
-      .sort((datalayer1, datalayer2) => datalayer1.rank > datalayer2.rank)
+      .sort((datalayer1, datalayer2) => datalayer1.rank - datalayer2.rank)
     for (const datalayer of datalayers) {
       const child = parent.querySelector(`[data-id="${datalayer.id}"]`)
       parent.appendChild(child)
@@ -768,14 +759,19 @@ export default class Umap {
   editCaption() {
     if (!this.editEnabled) return
     if (this.properties.editMode !== 'advanced') return
-    const container = DomUtil.create('div')
+    const container = DOMUtils.loadTemplate(`
+      <div>
+        <h3>
+          <i class="icon icon-16 icon-info"></i>
+          ${translate('Edit map details')}
+        </h3>
+      </div>
+    `)
     const metadataFields = [
       'properties.name',
       'properties.description',
       'properties.is_template',
     ]
-
-    DomUtil.createTitle(container, translate('Edit map details'), 'icon-info')
     const builder = new MutatingForm(this, metadataFields, {
       className: 'map-metadata',
       umap: this,
@@ -783,13 +779,13 @@ export default class Umap {
     const form = builder.build()
     container.appendChild(form)
 
-    const tags = DomUtil.createFieldset(container, translate('Tags'))
+    const tags = DOMUtils.createFieldset(container, translate('Tags'))
     const tagsFields = ['properties.tags']
     const tagsBuilder = new MutatingForm(this, tagsFields, {
       umap: this,
     })
     tags.appendChild(tagsBuilder.build())
-    const credits = DomUtil.createFieldset(container, translate('Credits'))
+    const credits = DOMUtils.createFieldset(container, translate('Credits'))
     const creditsFields = [
       'properties.licence',
       'properties.shortCredit',
@@ -805,7 +801,11 @@ export default class Umap {
   editCenter() {
     if (!this.editEnabled) return
     if (this.properties.editMode !== 'advanced') return
-    const container = DomUtil.create('div')
+    const container = DOMUtils.loadTemplate(`
+      <div>
+        <h3><i class="icon icon-16 icon-zoom"></i>${translate('Edit map default view')}</h3>
+      </div>
+    `)
     const metadataFields = [
       ['properties.zoom', { handler: 'IntInput', label: translate('Default zoom') }],
       [
@@ -819,13 +819,12 @@ export default class Umap {
       'properties.defaultView',
     ]
 
-    DomUtil.createTitle(container, translate('Edit map default view'), 'icon-zoom')
     const builder = new MutatingForm(this, metadataFields, {
       className: 'map-metadata',
       umap: this,
     })
     const form = builder.build()
-    const button = Utils.loadTemplate(
+    const button = DOMUtils.loadTemplate(
       `<button type="button">${translate('Use current center and zoom')}</button>`
     )
     button.addEventListener('click', () => {
@@ -854,7 +853,7 @@ export default class Umap {
       'properties.layerSwitcher',
     ])
     const builder = new MutatingForm(this, UIFields, { umap: this })
-    const controlsOptions = DomUtil.createFieldset(
+    const controlsOptions = DOMUtils.createFieldset(
       container,
       translate('User interface options')
     )
@@ -878,7 +877,7 @@ export default class Umap {
     ]
 
     const builder = new MutatingForm(this, shapeOptions, { umap: this })
-    const defaultShapeProperties = DomUtil.createFieldset(
+    const defaultShapeProperties = DOMUtils.createFieldset(
       container,
       translate('Default shape properties')
     )
@@ -896,7 +895,7 @@ export default class Umap {
     ]
 
     const builder = new MutatingForm(this, shapeOptions, { umap: this })
-    const defaultShapeProperties = DomUtil.createFieldset(
+    const defaultShapeProperties = DOMUtils.createFieldset(
       container,
       translate('Default properties')
     )
@@ -914,7 +913,7 @@ export default class Umap {
       'properties.outlinkTarget',
     ]
     const builder = new MutatingForm(this, popupFields, { umap: this })
-    const popupFieldset = DomUtil.createFieldset(
+    const popupFieldset = DOMUtils.createFieldset(
       container,
       translate('Default interaction options')
     )
@@ -966,7 +965,7 @@ export default class Umap {
         { handler: 'Switch', label: translate('TMS format') },
       ],
     ]
-    const customTilelayer = DomUtil.createFieldset(
+    const customTilelayer = DOMUtils.createFieldset(
       container,
       translate('Custom background')
     )
@@ -1017,7 +1016,7 @@ export default class Umap {
       ],
       ['properties.overlay.tms', { handler: 'Switch', label: translate('TMS format') }],
     ]
-    const overlay = DomUtil.createFieldset(container, translate('Custom overlay'))
+    const overlay = DOMUtils.createFieldset(container, translate('Custom overlay'))
     const builder = new MutatingForm(this, overlayFields, { umap: this })
     overlay.appendChild(builder.build())
   }
@@ -1026,7 +1025,7 @@ export default class Umap {
     if (!Utils.isObject(this.properties.limitBounds)) {
       this.properties.limitBounds = {}
     }
-    const limitBounds = DomUtil.createFieldset(container, translate('Limit bounds'))
+    const limitBounds = DOMUtils.createFieldset(container, translate('Limit bounds'))
     const boundsFields = [
       [
         'properties.limitBounds.south',
@@ -1047,28 +1046,29 @@ export default class Umap {
     ]
     const boundsBuilder = new MutatingForm(this, boundsFields, { umap: this })
     limitBounds.appendChild(boundsBuilder.build())
-    const boundsButtons = DomUtil.create('div', 'button-bar half', limitBounds)
-    DomUtil.createButton(
-      'button',
-      boundsButtons,
-      translate('Use current bounds'),
-      () => {
-        const bounds = this._leafletMap.getBounds()
-        const oldLimitBounds = { ...this.properties.limitBounds }
-        this.properties.limitBounds.south = LeafletUtil.formatNum(bounds.getSouth())
-        this.properties.limitBounds.west = LeafletUtil.formatNum(bounds.getWest())
-        this.properties.limitBounds.north = LeafletUtil.formatNum(bounds.getNorth())
-        this.properties.limitBounds.east = LeafletUtil.formatNum(bounds.getEast())
-        boundsBuilder.fetchAll()
-        this.sync.update(
-          'properties.limitBounds',
-          this.properties.limitBounds,
-          oldLimitBounds
-        )
-        this._leafletMap.handleLimitBounds()
-      }
-    )
-    DomUtil.createButton('button', boundsButtons, translate('Empty'), () => {
+    const [boundsButtons, { current, empty }] = DOMUtils.loadTemplateWithRefs(`
+      <div class="button-bar half">
+        <button type="button" data-ref="current">${translate('Use current bounds')}</button>
+        <button type="button" data-ref="empty">${translate('Empty')}</button>
+      </div>
+    `)
+    limitBounds.appendChild(boundsButtons)
+    current.addEventListener('click', () => {
+      const bounds = this._leafletMap.getBounds()
+      const oldLimitBounds = { ...this.properties.limitBounds }
+      this.properties.limitBounds.south = bounds.getSouth().toFixed(6)
+      this.properties.limitBounds.west = bounds.getWest().toFixed(6)
+      this.properties.limitBounds.north = bounds.getNorth().toFixed(6)
+      this.properties.limitBounds.east = bounds.getEast().toFixed(6)
+      boundsBuilder.fetchAll()
+      this.sync.update(
+        'properties.limitBounds',
+        this.properties.limitBounds,
+        oldLimitBounds
+      )
+      this._leafletMap.handleLimitBounds()
+    })
+    empty.addEventListener('click', () => {
       const oldLimitBounds = { ...this.properties.limitBounds }
       this.properties.limitBounds.south = null
       this.properties.limitBounds.west = null
@@ -1085,7 +1085,7 @@ export default class Umap {
   }
 
   _editSlideshow(container) {
-    const slideshow = DomUtil.createFieldset(container, translate('Slideshow'))
+    const slideshow = DOMUtils.createFieldset(container, translate('Slideshow'))
     const slideshowFields = [
       [
         'properties.slideshow.active',
@@ -1118,7 +1118,10 @@ export default class Umap {
   }
 
   _editSync(container) {
-    const sync = DomUtil.createFieldset(container, translate('Real-time collaboration'))
+    const sync = DOMUtils.createFieldset(
+      container,
+      translate('Real-time collaboration')
+    )
     const builder = new MutatingForm(this, ['properties.syncEnabled'], {
       umap: this,
     })
@@ -1126,7 +1129,7 @@ export default class Umap {
   }
 
   _advancedActions(container) {
-    const advancedActions = DomUtil.createFieldset(
+    const advancedActions = DOMUtils.createFieldset(
       container,
       translate('Advanced actions')
     )
@@ -1150,7 +1153,7 @@ export default class Umap {
     </div>
     `
     const [bar, { del, clear, empty, clone, download }] =
-      Utils.loadTemplateWithRefs(tpl)
+      DOMUtils.loadTemplateWithRefs(tpl)
     advancedActions.appendChild(bar)
     if (this.permissions.isOwner()) {
       del.hidden = false
@@ -1167,12 +1170,11 @@ export default class Umap {
   edit() {
     if (!this.editEnabled) return
     if (this.properties.editMode !== 'advanced') return
-    const container = DomUtil.create('div')
-    DomUtil.createTitle(
-      container,
-      translate('Map advanced properties'),
-      'icon-settings'
-    )
+    const container = DOMUtils.loadTemplate(`
+      <div>
+        <h3><i class="icon icon-16 icon-settings"></i>${translate('Map advanced properties')}</h3>
+      </div>
+    `)
     this._editControls(container)
     this._editShapeProperties(container)
     this._editDefaultKeys(container)
@@ -1224,7 +1226,7 @@ export default class Umap {
     if (error) {
       return
     }
-    // TOOD: map.save may not always be the first call during save process
+    // TODO: map.save may not always be the first call during save process
     // since SAVEMANAGER refactor
     if (data.login_required) {
       this.askForLogin().then(() => this.saveAll())
@@ -1457,7 +1459,7 @@ export default class Umap {
   }
 
   // This method does a targeted update of the UI,
-  // it whould be merged with `render`` method and the
+  // it would be merged with `render`` method and the
   // SCHEMA at some point
   propagate(fields = []) {
     const impacts = {
@@ -1604,9 +1606,11 @@ export default class Umap {
       else if (finalIndex > initialIndex) movedLayer.insertBefore(targetLayer)
       else movedLayer.insertAfter(targetLayer)
       this.sync.startBatch()
-      this.datalayers.reverse().map((datalayer) => {
+      this.datalayers.reverse().map(async (datalayer) => {
         const rank = datalayer.getDOMOrder()
         if (rank >= minIndex && rank <= maxIndex) {
+          // TODO allow to save only metadata instead of force loading data
+          if (!datalayer.isLoaded()) await datalayer.fetchData()
           const oldRank = datalayer.rank
           datalayer.rank = rank
           datalayer.sync.update('options.rank', rank, oldRank)
@@ -1618,14 +1622,13 @@ export default class Umap {
     }
     const orderable = new Orderable(ul, onReorder)
 
-    const bar = DomUtil.create('div', 'button-bar', container)
-    DomUtil.createButton(
-      'show-on-edit block add-datalayer button',
-      bar,
-      translate('Add a layer'),
-      this.newDataLayer,
-      this
-    )
+    const [bar, { button }] = DOMUtils.loadTemplateWithRefs(`
+      <div class="button-bar">
+        <button type="button" class="show-on-edit block add-datalayer" data-ref="button">${translate('Add a layer')}</button>
+      </div>
+    `)
+    button.addEventListener('click', () => this.newDataLayer())
+    container.appendChild(bar)
 
     this.editPanel.open({ content: container, highlight: 'layers' })
   }
@@ -1733,6 +1736,7 @@ export default class Umap {
     const fields = Object.keys(importedData.properties).map(
       (field) => `properties.${field}`
     )
+    this.fields.pull()
     this.filters.load()
     this.render(fields)
     this._leafletMap._setDefaultCenter()
@@ -1785,16 +1789,12 @@ export default class Umap {
     await this.server.post(sendLink, {}, formData)
   }
 
-  getLayersBounds() {
-    const bounds = new latLngBounds()
-    this.datalayers.browsable().map((d) => {
-      if (d.isVisible()) bounds.extend(d.layer.getBounds())
-    })
-    return bounds
-  }
-
   fitDataBounds() {
-    const bounds = this.getLayersBounds()
+    const layers = this.datalayers
+      .browsable()
+      .filter((d) => d.isVisible())
+      .map((d) => d.layer)
+    const bounds = this._leafletMap.getLayersBounds(layers)
     if (!this.hasData() || !bounds.isValid()) return false
     this._leafletMap.fitBounds(bounds)
   }

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

@@ -40,7 +40,7 @@ function _getPropertyName(field) {
  * Return an array of unique impacts.
  *
  * @param {fields}  list[fields]
- * @param object schema object. If ommited, global U.SCHEMA will be used.
+ * @param object schema object. If omitted, global U.SCHEMA will be used.
  * @returns Array[string]
  */
 export function getImpactsFromSchema(fields, schema) {
@@ -177,15 +177,15 @@ export function toHTML(r, options) {
   // iframe
   r = r.replace(
     /{{{(https?[^|{]*)}}}/g,
-    '<div><iframe frameborder="0" src="$1" width="100%" height="300px"></iframe></div>'
+    '<div><iframe allowfullscreen src="$1" style="width: 100%; height: 300px; border: 0;"></iframe></div>'
   )
   r = r.replace(
     /{{{(https?[^|{]*)\|(\d*)(px)?}}}/g,
-    '<div><iframe frameborder="0" src="$1" width="100%" height="$2px"></iframe></div>'
+    '<div><iframe allowfullscreen src="$1" style="width: 100%; height: $2px; border: 0;"></iframe></div>'
   )
   r = r.replace(
     /{{{(https?[^|{]*)\|(\d*)(px)?\*(\d*)(px)?}}}/g,
-    '<div><iframe frameborder="0" src="$1" width="$4px" height="$2px"></iframe></div>'
+    '<div><iframe allowfullscreen src="$1" style="width: $4px; height: $2px; border: 0;"></iframe></div>'
   )
 
   // images
@@ -681,3 +681,12 @@ export const COLORS = [
   'Ivory',
   'White',
 ]
+
+export const LatLngIsValid = (latlng) => {
+  return (
+    Number.isFinite(latlng.lat) &&
+    Math.abs(latlng.lat) <= 90 &&
+    Number.isFinite(latlng.lng) &&
+    Math.abs(latlng.lng) <= 180
+  )
+}

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

@@ -45,14 +45,12 @@ U.TileLayerControl = L.Control.IconLayers.extend({
     const lastRow = this._container.querySelector(
       '.leaflet-iconLayers-layersRow:last-child'
     )
-    const button = L.DomUtil.element({
-      tagName: 'button',
-      className:
-        'leaflet-iconLayers-layerCell leaflet-iconLayers-layerCell-plus button',
-      textContent: '+',
-      parent: lastRow,
-    })
-    L.DomEvent.on(button, 'click', () =>
+    const button = document.createElement('button')
+    button.className =
+      'leaflet-iconLayers-layerCell leaflet-iconLayers-layerCell-plus button'
+    button.textContent = '+'
+    lastRow.appendChild(button)
+    button.addEventListener('click', () =>
       this.map._controls.tilelayersChooser.openSwitcher()
     )
   },
@@ -130,7 +128,7 @@ U.Search = L.PhotonSearch.extend({
       this.hide()
       const { lat, lng } = pattern.exec(this.input.value).groups
       const latlng = L.latLng(lat, lng)
-      if (latlng.isValid()) {
+      if (U.Utils.LatLngIsValid(latlng)) {
         this.reverse.doReverse(latlng)
       } else {
         U.Alert.error(L._('Invalid latitude or longitude'))
@@ -175,8 +173,8 @@ U.Search = L.PhotonSearch.extend({
       if (!osm_type || !osm_id) return
       const importer = this.map._umap.importer
       importer.build()
-      importer.format = 'osm'
-      importer.url = `https://www.openstreetmap.org/api/0.6/${osm_type}/${osm_id}/full`
+      importer.format = 'geojson'
+      importer.raw = await this.getOSMObject(osm_type, osm_id)
       importer.submit()
     })
     el.appendChild(tools)
@@ -197,6 +195,18 @@ U.Search = L.PhotonSearch.extend({
     })
   },
 
+  async getOSMObject(osm_type, osm_id) {
+    const url = `https://www.openstreetmap.org/api/0.6/${osm_type}/${osm_id}/full`
+    const response = await this.map._umap.request.get(url)
+    if (response?.ok) {
+      const data = await this.map._umap.formatter.fromOSM(await response.text())
+      data.features = data.features.filter(
+        (feature) => feature.properties.id === `${osm_type}/${osm_id}`
+      )
+      return JSON.stringify(data)
+    }
+  },
+
   setChoice: function (choice) {
     choice = choice || this.RESULTS[this.CURRENT]
     if (choice) {
@@ -230,7 +240,8 @@ L.Control.MiniMap.include({
 
 L.Control.Loading.include({
   onAdd: function (map) {
-    this._container = L.DomUtil.create('div', 'umap-loader', map._controlContainer)
+    this._container = document.createElement('div')
+    this._container.classList.add('umap-loader')
     map.on('baselayerchange', this._layerAdd, this)
     this._addMapListeners(map)
     this._map = map
@@ -252,9 +263,10 @@ U.Editable = L.Editable.extend({
     this.on('editable:drawing:click editable:drawing:move', this.drawingTooltip)
     // Layer for items added by users
     this.on('editable:drawing:cancel', (event) => {
-      if (event.layer instanceof U.LeafletMarker) event.layer.feature.del()
+      this.resetButtons()
     })
     this.on('editable:drawing:commit', function (event) {
+      this.resetButtons()
       if (this._umap.editedFeature !== event.layer) {
         const promise = event.layer.feature.edit(event)
         if (event.layer.feature.isRoute?.()) {
@@ -278,6 +290,13 @@ U.Editable = L.Editable.extend({
     this.on('editable:vertex:rawclick', this.onVertexRawClick)
   },
 
+  resetButtons: () => {
+    const buttons = document.querySelectorAll('.umap-edit-bar .drawing-tool')
+    for (const button of buttons) {
+      button.classList.remove('on')
+    }
+  },
+
   startRoute: function (latlng) {
     const feature = this.createLineString()
     feature.askForRouteSettings().then(async () => {
@@ -402,7 +421,7 @@ U.Editable = L.Editable.extend({
       // (eg. line has only one drawn point)
       // So let's check if the layer has no more shape
       event.layer.feature.pullGeometry(false)
-      if (!event.layer.feature.hasGeom()) {
+      if (!event.layer.feature.hasGeom() || event.layer instanceof U.LeafletMarker) {
         event.layer.feature.del()
       } else {
         event.layer.feature.onCommit()

umap/static/umap/locale/am_ET.js

@@ -70,7 +70,7 @@ 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, 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 ተመላክቷል። የነጥብ ጂኦሜትሪዎች ብቻ መጥተዋል። የማምጣት ሂደቱ የኮለምን ሄደሮችን በማሰስ «ላቲትዩድ» እና «ሎንጊትዩድ» የሚሉትን ቃላት መኖር ከመጀመሪያው በመነሳት ያጣራል። ሁሉም ኮለምኖች እንደባህርይ መጥተዋል።",
+    "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 beginning of the header, case insensitive. All other column are imported as properties.": "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 beginning of the header, case insensitive. All other column are imported as properties.",
     "Congratulations, your map has been created!": "Congratulations, your map has been created!",
     "Continue line": "መስመሩን ቀጥል",
     "Coordinates": "ኮርዲኔቶች",
@@ -99,7 +99,6 @@ const locale = {
     "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)",
     "Delete": "ሰርዝ",
     "description": "መገለጫ",
-    "Direct link": "Direct link",
     "Directions from here": "ከዚህ የሚነሱ አቅጣጫዎች",
     "Display label": "Display label",
     "Display measure": "Display measure",
@@ -135,7 +134,6 @@ const locale = {
     "Edit this feature": "ይህንን ፊቸር አርም",
     "Edit": "አርም",
     "Embed and link options": "Embed and link options",
-    "Embed the map": "ካርታውን አካትት",
     "Emoji & Character": "Emoji & Character",
     "Empty": "ባዶ",
     "Equidistant": "Equidistant",
@@ -159,7 +157,6 @@ const locale = {
     "Go to \"{coords}\"": "Go to \"{coords}\"",
     "Go to the homepage": "Go to the homepage",
     "Go to «{feature}»": "ወደ «{feature}» ተመለስ",
-    "Heatmap intensity property": "የሙቀት ካርታ ኢንቴንሲቲ ባህርይ",
     "Heatmap radius": "የሙቀት ካርታ ራዲየስ",
     "Heatmap": "የሙቀት ካርታ",
     "height": "ቁመት",
@@ -255,7 +252,6 @@ const locale = {
     "Open share & download panel": "Open share & download panel",
     "Open this map extent in a map editor to provide more accurate data to OpenStreetMap": "ለOpernStreetMap ይበልጥ ትክክል ይሆነ መረጃ ለመስጠ የካርታውን ኤክስቴንት በካርታ ማረሚያ ክፈት",
     "OpenStreetMap": "OpenStreetMap",
-    "Optional intensity property for heatmap": "ለሙቀት ካርታው ባህርይ አማራጭ ኢንቴንሲቲ",
     "Optional. Same as color if not set.": "አማራጭ፣ ካልተመረጠለት እንደቀለሙ የሚሆን",
     "Optional.": "Optional.",
     "Override clustering radius (default 80)": "የራዲየስ ክለስተሪንግ አልፈህ ሂድ (ዲፎልት 80)",
@@ -297,7 +293,6 @@ const locale = {
     "settings": "settings",
     "Shape properties": "Shape properties",
     "Share and download": "Share and download",
-    "Share this link to open a customized map view": "Share this link to open a customized map view",
     "Short credits": "አጭር ክሬዲት",
     "Short link": "Short link",
     "Show this layer in the caption": "Show this layer in the caption",
@@ -631,7 +626,6 @@ const locale = {
     "Are you sure you want to delete this field on all the data?": "Are you sure you want to delete this field on all the data?",
     "Anonymous map": "Anonymous map",
     "Edit filter for this field": "Edit filter for this field",
-    "Fields, filters and keys": "Fields, filters and keys",
     "Hey, you created a map without an account!": "Hey, you created a map without an account!",
     "This map is anonymous, do you want to attach it to your account?": "This map is anonymous, do you want to attach it to your account?",
     "The map has been upgraded to latest version, please save it.": "The map has been upgraded to latest version, please save it.",
@@ -641,7 +635,24 @@ const locale = {
     "Wikipedia contributors": "Wikipedia contributors",
     "See on Wikipedia": "See on Wikipedia",
     "Anonymous map: update who can see and edit it": "Anonymous map: update who can see and edit it",
-    "Login": "Login"
+    "Login": "Login",
+    "Manage filters": "Manage filters",
+    "Map (all layers)": "Map (all layers)",
+    "Add a filter for this field": "Add a filter for this field",
+    "Short text": "Short text",
+    "Text": "Text",
+    "Number": "Number",
+    "Date": "Date",
+    "Date and time": "Date and time",
+    "List of values": "List of values",
+    "Yes / No": "Yes / No",
+    "Select field to compute intensity": "Select field to compute intensity",
+    "Optional intensity field to compute heatmap": "Optional intensity field to compute heatmap",
+    "All layers": "All layers",
+    "Comma separated list of values": "Comma separated list of values",
+    "Share": "Share",
+    "Customized link": "Customized link",
+    "Iframe": "Iframe"
 }
 L.registerLocale("am_ET", locale)
 L.setLocale("am_ET")