umap-project 2.8.0a2__py3-none-any.whl → 2.8.1__py3-none-any.whl

umap/static/umap/js/modules/ui/bar.js

@@ -110,7 +110,7 @@ export class TopBar extends WithTemplate {
       })
     })
 
-    this.elements.help.addEventListener('click', () => this._umap.showGetStarted())
+    this.elements.help.addEventListener('click', () => this._umap.help.showGetStarted())
     this.elements.cancel.addEventListener('click', () => this._umap.askForReset())
     this.elements.cancel.addEventListener('mouseover', () => {
       this._umap.tooltip.open({

umap/static/umap/js/modules/ui/dialog.js

@@ -6,6 +6,7 @@ const TEMPLATE = `
     <form method="dialog" data-ref="form">
       <ul class="buttons">
         <li><i class="icon icon-16 icon-close" data-close></i></li>
+        <li hidden data-ref="back"><i class="icon icon-16 icon-back"></i></li>
       </ul>
       <h3 data-ref="message" id="${Math.round(Date.now()).toString(36)}"></h3>
       <fieldset data-ref="fieldset" role="document">
@@ -123,6 +124,10 @@ export default class Dialog extends WithTemplate {
     } else {
       this.elements.template.innerHTML = dialog.template || ''
     }
+    this.elements.back.hidden = !dialog.back
+    if (dialog.back) {
+      this.elements.back.addEventListener('click', dialog.back)
+    }
 
     this.focusable = this.getFocusable()
     this.hasFormData = this.elements.fieldset.elements.length > 0

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

@@ -61,8 +61,6 @@ export default class Umap extends ServerStored {
     )
     this.searchParams = new URLSearchParams(window.location.search)
 
-    this.sync_engine = new SyncEngine(this)
-    this.sync = this.sync_engine.proxy(this)
     // Locale name (pt_PT, en_US…)
     // To be used for Django localization
     if (geojson.properties.locale) setLocale(geojson.properties.locale)
@@ -124,6 +122,9 @@ export default class Umap extends ServerStored {
     this.share = new Share(this)
     this.rules = new Rules(this)
 
+    this.syncEngine = new SyncEngine(this)
+    this.sync = this.syncEngine.proxy(this)
+
     if (this.hasEditMode()) {
       this.editPanel = new EditPanel(this, this._leafletMap)
       this.fullPanel = new FullPanel(this, this._leafletMap)
@@ -218,6 +219,14 @@ export default class Umap extends ServerStored {
     this.fire('seteditedfeature')
   }
 
+  get activeFeature() {
+    return this._activeFeature
+  }
+
+  set activeFeature(feature) {
+    this._activeFeature = feature
+  }
+
   setPropertiesFromQueryString() {
     const asBoolean = (key) => {
       const value = this.searchParams.get(key)
@@ -315,14 +324,14 @@ export default class Umap extends ServerStored {
         dataUrl = decodeURIComponent(dataUrl)
         dataUrl = this.renderUrl(dataUrl)
         dataUrl = this.proxyUrl(dataUrl)
-        const datalayer = this.createDataLayer()
+        const datalayer = this.createDirtyDataLayer()
         await datalayer
           .importFromUrl(dataUrl, dataFormat)
           .then(() => datalayer.zoomTo())
       }
     } else if (data) {
       data = decodeURIComponent(data)
-      const datalayer = this.createDataLayer()
+      const datalayer = this.createDirtyDataLayer()
       await datalayer.importRaw(data, dataFormat).then(() => datalayer.zoomTo())
     }
   }
@@ -570,9 +579,15 @@ export default class Umap extends ServerStored {
     }
     this.datalayersLoaded = true
     this.fire('datalayersloaded')
+    const toLoad = []
     for (const datalayer of this.datalayersIndex) {
-      if (datalayer.showAtLoad()) await datalayer.show()
+      if (datalayer.showAtLoad()) toLoad.push(() => datalayer.show())
     }
+    while (toLoad.length) {
+      const chunk = toLoad.splice(0, 10)
+      await Promise.all(chunk.map((func) => func()))
+    }
+
     this.dataloaded = true
     this.fire('dataloaded')
   }
@@ -588,8 +603,14 @@ export default class Umap extends ServerStored {
     return datalayer
   }
 
+  createDirtyDataLayer(options) {
+    const datalayer = this.createDataLayer(options, true)
+    datalayer.isDirty = true
+    return datalayer
+  }
+
   newDataLayer() {
-    const datalayer = this.createDataLayer({})
+    const datalayer = this.createDirtyDataLayer({})
     datalayer.edit()
   }
 
@@ -643,6 +664,12 @@ export default class Umap extends ServerStored {
     // have changed, we'll be more subtil when we'll remove the
     // save action
     this.render(['name', 'user', 'permissions'])
+    if (!this._leafletMap.listens('saved')) {
+      // When we save only layers, we don't have the map feedback message
+      this._leafletMap.on('saved', () => {
+        Alert.success(translate('Map has been saved!'))
+      })
+    }
     this.fire('saved')
   }
 
@@ -1101,8 +1128,8 @@ export default class Umap extends ServerStored {
     }
     this.ensurePanesOrder()
     this._leafletMap.initTileLayers()
-    this.isDirty = false
     this.onDataLayersChanged()
+    this.isDirty = !this.id
   }
 
   async save() {
@@ -1184,7 +1211,7 @@ export default class Umap extends ServerStored {
   geometry() {
     /* Return a GeoJSON geometry Object */
     const latlng = this._leafletMap.latLng(
-      this._leafletMap.options.center || this._leafletMap.getCenter()
+      this.properties.center || this._leafletMap.getCenter()
     )
     return {
       type: 'Point',
@@ -1241,18 +1268,13 @@ export default class Umap extends ServerStored {
   }
 
   async initSyncEngine() {
+    // this.properties.websocketEnabled is set by the server admin
     if (this.properties.websocketEnabled === false) return
+    // this.properties.syncEnabled is set by the user in the map settings
     if (this.properties.syncEnabled !== true) {
       this.sync.stop()
     } else {
-      const ws_token_uri = this.urls.get('map_websocket_auth_token', {
-        map_id: this.id,
-      })
-      await this.sync.authenticate(
-        ws_token_uri,
-        this.properties.websocketURI,
-        this.server
-      )
+      await this.sync.authenticate()
     }
   }
 
@@ -1327,7 +1349,17 @@ export default class Umap extends ServerStored {
       },
       numberOfConnectedPeers: () => {
         Utils.eachElement('.connected-peers span', (el) => {
-          el.textContent = this.sync.getNumberOfConnectedPeers()
+          if (this.sync.websocketConnected) {
+            el.textContent = this.sync.getNumberOfConnectedPeers()
+          } else {
+            el.textContent = translate('Disconnected')
+          }
+          el.parentElement.classList.toggle('off', !this.sync.websocketConnected)
+        })
+      },
+      'properties.starred': () => {
+        Utils.eachElement('.map-star', (el) => {
+          el.classList.toggle('starred', this.properties.starred)
         })
       },
     }
@@ -1367,7 +1399,7 @@ export default class Umap extends ServerStored {
       fallback.show()
       return fallback
     }
-    return this.createDataLayer()
+    return this.createDirtyDataLayer()
   }
 
   findDataLayer(method, context) {
@@ -1426,9 +1458,14 @@ export default class Umap extends ServerStored {
       const row = DomUtil.create('li', 'orderable', ul)
       DomUtil.createIcon(row, 'icon-drag', translate('Drag to reorder'))
       datalayer.renderToolbox(row)
-      const title = DomUtil.add('span', '', row, datalayer.options.name)
+      const builder = new U.FormBuilder(
+        datalayer,
+        [['options.name', { handler: 'EditableText' }]],
+        { className: 'umap-form-inline' }
+      )
+      const form = builder.build()
+      row.appendChild(form)
       row.classList.toggle('off', !datalayer.isVisible())
-      title.textContent = datalayer.options.name
       row.dataset.id = stamp(datalayer)
     })
     const onReorder = (src, dst, initialIndex, finalIndex) => {
@@ -1510,7 +1547,7 @@ export default class Umap extends ServerStored {
         ? translate('Map has been starred')
         : translate('Map has been unstarred')
     )
-    this.render(['starred'])
+    this.render(['properties.starred'])
   }
 
   processFileToImport(file, layer, type) {
@@ -1526,7 +1563,7 @@ export default class Umap extends ServerStored {
     if (type === 'umap') {
       this.importUmapFile(file, 'umap')
     } else {
-      if (!layer) layer = this.createDataLayer({ name: file.name })
+      if (!layer) layer = this.createDirtyDataLayer({ name: file.name })
       layer.importFromFile(file, type)
     }
   }
@@ -1552,7 +1589,7 @@ export default class Umap extends ServerStored {
         delete geojson._storage
       }
       delete geojson._umap_options?.id // Never trust an id at this stage
-      const dataLayer = this.createDataLayer(geojson._umap_options)
+      const dataLayer = this.createDirtyDataLayer(geojson._umap_options)
       dataLayer.fromUmapGeoJSON(geojson)
     }
 
@@ -1662,8 +1699,8 @@ export default class Umap extends ServerStored {
   }
 
   _setCenterAndZoom() {
-    this._leafletMap.options.center = this._leafletMap.getCenter()
-    this._leafletMap.options.zoom = this._leafletMap.getZoom()
+    this.properties.center = this._leafletMap.getCenter()
+    this.properties.zoom = this._leafletMap.getZoom()
     this.isDirty = true
     this._defaultExtent = false
   }

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

@@ -115,6 +115,8 @@ export function escapeHTML(s) {
       'span',
       'dt',
       'dd',
+      'b',
+      'i',
     ],
     ADD_ATTR: [
       'target',

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

@@ -337,52 +337,6 @@ U.DrawToolbar = L.Toolbar.Control.extend({
   },
 })
 
-U.DropControl = L.Class.extend({
-  initialize: function (map) {
-    this.map = map
-    this.dropzone = map._container
-  },
-
-  enable: function () {
-    L.DomEvent.on(this.dropzone, 'dragenter', this.dragenter, this)
-    L.DomEvent.on(this.dropzone, 'dragover', this.dragover, this)
-    L.DomEvent.on(this.dropzone, 'drop', this.drop, this)
-    L.DomEvent.on(this.dropzone, 'dragleave', this.dragleave, this)
-  },
-
-  disable: function () {
-    L.DomEvent.off(this.dropzone, 'dragenter', this.dragenter, this)
-    L.DomEvent.off(this.dropzone, 'dragover', this.dragover, this)
-    L.DomEvent.off(this.dropzone, 'drop', this.drop, this)
-    L.DomEvent.off(this.dropzone, 'dragleave', this.dragleave, this)
-  },
-
-  dragenter: function (event) {
-    L.DomEvent.stop(event)
-    this.map.scrollWheelZoom.disable()
-    this.dropzone.classList.add('umap-dragover')
-  },
-
-  dragover: (event) => {
-    L.DomEvent.stop(event)
-  },
-
-  drop: function (event) {
-    this.map.scrollWheelZoom.enable()
-    this.dropzone.classList.remove('umap-dragover')
-    L.DomEvent.stop(event)
-    for (const file of event.dataTransfer.files) {
-      this.map._umap.processFileToImport(file)
-    }
-    this.map._umap.onceDataLoaded(this.map._umap.fitDataBounds)
-  },
-
-  dragleave: function () {
-    this.map.scrollWheelZoom.enable()
-    this.dropzone.classList.remove('umap-dragover')
-  },
-})
-
 U.EditControl = L.Control.extend({
   options: {
     position: 'topright',
@@ -541,11 +495,7 @@ U.StarControl = L.Control.Button.extend({
   options: {
     position: 'topleft',
     title: L._('Star this map'),
-  },
-
-  getClassName: function () {
-    const status = this._umap.properties.starred ? ' starred' : ''
-    return `leaflet-control-star umap-control${status}`
+    className: 'leaflet-control-star map-star umap-control',
   },
 
   onClick: function () {
@@ -683,10 +633,13 @@ U.TileLayerChooser = L.Control.extend({
     L.DomEvent.on(
       el,
       'click',
-      function () {
+      () => {
         this.map.selectTileLayer(tilelayer)
         this.map._controls.tilelayers.setLayers()
-        if (options?.callback) options.callback(tilelayer)
+        if (options?.edit) {
+          this.map._umap.properties.tilelayer = tilelayer.toJSON()
+          this.map._umap.isDirty = true
+        }
       },
       this
     )
@@ -942,11 +895,11 @@ L.Control.Loading.include({
   },
 
   _showIndicator: function () {
-    L.DomUtil.addClass(this._map._container, 'umap-loading')
+    this._map._container.classList.add('umap-loading')
   },
 
   _hideIndicator: function () {
-    L.DomUtil.removeClass(this._map._container, 'umap-loading')
+    this._map._container.classList.remove('umap-loading')
   },
 })
 

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

@@ -259,6 +259,35 @@ L.FormBuilder.CheckBox.include({
   },
 })
 
+L.FormBuilder.EditableText = L.FormBuilder.Element.extend({
+  build: function () {
+    this.input = L.DomUtil.create('span', this.options.className || '', this.parentNode)
+    this.input.contentEditable = true
+    this.fetch()
+    L.DomEvent.on(this.input, 'input', this.sync, this)
+    L.DomEvent.on(this.input, 'keypress', this.onKeyPress, this)
+  },
+
+  getParentNode: function () {
+    return this.form
+  },
+
+  value: function () {
+    return this.input.textContent
+  },
+
+  fetch: function () {
+    this.input.textContent = this.toHTML()
+  },
+
+  onKeyPress: function (event) {
+    if (event.keyCode === 13) {
+      event.preventDefault()
+      this.input.blur()
+    }
+  },
+})
+
 L.FormBuilder.ColorPicker = L.FormBuilder.Input.extend({
   colors: U.COLORS,
   getParentNode: function () {
@@ -1192,6 +1221,21 @@ U.FormBuilder = L.FormBuilder.extend({
     }
   },
 
+  getter: function (field) {
+    const path = field.split('.')
+    let value = this.obj
+    let sub
+    for (sub of path) {
+      try {
+        value = value[sub]
+      } catch {
+        console.log(field)
+      }
+    }
+    if (value === undefined) values = U.SCHEMA[sub]?.default
+    return value
+  },
+
   finish: (event) => {
     event.helper?.input?.blur()
   },

umap/static/umap/locale/cs_CZ.js

@@ -183,12 +183,12 @@ const locale = {
     "Icon shape": "Tvar ikony",
     "Icon symbol": "Symbol ikony",
     "If false, the polygon or line will act as a part of the underlying map.": "Pokud je hodnota false, polygon nebo linie bude fungovat jako součást podkladové mapy.",
-    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}",
-    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}",
+    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe s vlastní výškou (v px): 1{{{https://iframe.url.com|výška}}}",
+    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe s vlastní výškou a šířkou (v px): 1{{{https://iframe.url.com|výška*šířka}}}",
     "iframe": "iframe",
     "Iframe: {{{https://iframe.url.com}}}": "Iframe: {{{https://iframe.url.com}}}",
-    "Image with custom width (in px): {{https://image.url.com|width}}": "Image with custom width (in px): {{https://image.url.com|width}}",
-    "Image: {{https://image.url.com}}": "Image: {{https://image.url.com}}",
+    "Image with custom width (in px): {{https://image.url.com|width}}": "Obrázek s vlastní šířkou (v px): 1{{{https://iframe.url.com|šířka}}}",
+    "Image: {{https://image.url.com}}": "Obrázek: 1{{https://obrázek.url.com}}",
     "Import data": "Import dat",
     "Import in a new layer": "Importovat do nové vrstvy",
     "Imports all umap data, including layers and settings.": "Importuje všechy data umapy, včetně vrstev a nastavení",
@@ -216,7 +216,7 @@ const locale = {
     "Limit bounds": "Hranice zobrazení",
     "Link to view the map": "Odkaz pro zobrazení mapy",
     "Link to…": "Odkaz na…",
-    "Link with text: [[https://example.com|text of the link]]": "Link with text: [[https://example.com|text of the link]]",
+    "Link with text: [[https://example.com|text of the link]]": "Odkaz s textem: [[https://priklad.cz|text odkazu]]",
     "Long credits": "Dlouhý text autorství",
     "Longitude": "Délka",
     "Make main shape": "Učinit hlavním tvarem",
@@ -320,7 +320,7 @@ const locale = {
     "Show this layer in the caption": "Zobrazit tuto vrstvu v nadpisu",
     "Show/hide layer": "Skrytí/zobrazení vrstvy",
     "Side panel": "Boční panel",
-    "Simple link: [[https://example.com]]": "Simple link: [[https://example.com]]",
+    "Simple link: [[https://example.com]]": "Jednoduchý odkaz: [[https://priklad.cz]]",
     "Simplify": "Zjednodušit",
     "Skipping unknown geometry.type: {type}": "Přeskakuji neznámý geometry.type: {type}",
     "Slideshow": "Prezentace",
@@ -516,11 +516,13 @@ const locale = {
     "show/hide all layers": "zobrazit/skrýt všechny vrstvy",
     "zoom to data extent": "přiblížit na rozsah dat",
     "download visible data": "stáhnout viditelná data",
-    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map",
-    "Import helpers": "Import helpers",
-    "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
-    "Wikipedia": "Wikipedia",
-    "Save draft": "Save draft"
+    "{connectedPeers} peer(s) currently connected to this map": "K této mapě je aktuálně připojeno {connectedPeers} vrstevník(ů)",
+    "Import helpers": "Pomocníci pro import",
+    "Import helpers will fill the URL field for you.": "Pomocníci pro import vyplní pole URL za vás.",
+    "Wikipedia": "Wikipedie",
+    "Save draft": "Uložit koncept",
+    "No data has been found for import": "Nebyla nalezena žádná data pro import",
+    "Successfully imported {count} feature(s)": "Počet úspěšně importovaných prvků: {count}"
 }
 L.registerLocale("cs_CZ", locale)
 L.setLocale("cs_CZ")

umap/static/umap/locale/cs_CZ.json

@@ -183,12 +183,12 @@
     "Icon shape": "Tvar ikony",
     "Icon symbol": "Symbol ikony",
     "If false, the polygon or line will act as a part of the underlying map.": "Pokud je hodnota false, polygon nebo linie bude fungovat jako součást podkladové mapy.",
-    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}",
-    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}",
+    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe s vlastní výškou (v px): 1{{{https://iframe.url.com|výška}}}",
+    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe s vlastní výškou a šířkou (v px): 1{{{https://iframe.url.com|výška*šířka}}}",
     "iframe": "iframe",
     "Iframe: {{{https://iframe.url.com}}}": "Iframe: {{{https://iframe.url.com}}}",
-    "Image with custom width (in px): {{https://image.url.com|width}}": "Image with custom width (in px): {{https://image.url.com|width}}",
-    "Image: {{https://image.url.com}}": "Image: {{https://image.url.com}}",
+    "Image with custom width (in px): {{https://image.url.com|width}}": "Obrázek s vlastní šířkou (v px): 1{{{https://iframe.url.com|šířka}}}",
+    "Image: {{https://image.url.com}}": "Obrázek: 1{{https://obrázek.url.com}}",
     "Import data": "Import dat",
     "Import in a new layer": "Importovat do nové vrstvy",
     "Imports all umap data, including layers and settings.": "Importuje všechy data umapy, včetně vrstev a nastavení",
@@ -216,7 +216,7 @@
     "Limit bounds": "Hranice zobrazení",
     "Link to view the map": "Odkaz pro zobrazení mapy",
     "Link to…": "Odkaz na…",
-    "Link with text: [[https://example.com|text of the link]]": "Link with text: [[https://example.com|text of the link]]",
+    "Link with text: [[https://example.com|text of the link]]": "Odkaz s textem: [[https://priklad.cz|text odkazu]]",
     "Long credits": "Dlouhý text autorství",
     "Longitude": "Délka",
     "Make main shape": "Učinit hlavním tvarem",
@@ -320,7 +320,7 @@
     "Show this layer in the caption": "Zobrazit tuto vrstvu v nadpisu",
     "Show/hide layer": "Skrytí/zobrazení vrstvy",
     "Side panel": "Boční panel",
-    "Simple link: [[https://example.com]]": "Simple link: [[https://example.com]]",
+    "Simple link: [[https://example.com]]": "Jednoduchý odkaz: [[https://priklad.cz]]",
     "Simplify": "Zjednodušit",
     "Skipping unknown geometry.type: {type}": "Přeskakuji neznámý geometry.type: {type}",
     "Slideshow": "Prezentace",
@@ -516,9 +516,11 @@
     "show/hide all layers": "zobrazit/skrýt všechny vrstvy",
     "zoom to data extent": "přiblížit na rozsah dat",
     "download visible data": "stáhnout viditelná data",
-    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map",
-    "Import helpers": "Import helpers",
-    "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
-    "Wikipedia": "Wikipedia",
-    "Save draft": "Save draft"
+    "{connectedPeers} peer(s) currently connected to this map": "K této mapě je aktuálně připojeno {connectedPeers} vrstevník(ů)",
+    "Import helpers": "Pomocníci pro import",
+    "Import helpers will fill the URL field for you.": "Pomocníci pro import vyplní pole URL za vás.",
+    "Wikipedia": "Wikipedie",
+    "Save draft": "Uložit koncept",
+    "No data has been found for import": "Nebyla nalezena žádná data pro import",
+    "Successfully imported {count} feature(s)": "Počet úspěšně importovaných prvků: {count}"
 }

umap/static/umap/locale/en.js

@@ -522,7 +522,8 @@ const locale = {
     "Wikipedia": "Wikipedia",
     "Save draft": "Save draft",
     "No data has been found for import": "No data has been found for import",
-    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)"
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)",
+    "Disconnected": "Disconnected"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

umap/static/umap/locale/en.json

@@ -522,5 +522,6 @@
     "Wikipedia": "Wikipedia",
     "Save draft": "Save draft",
     "No data has been found for import": "No data has been found for import",
-    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)"
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)",
+    "Disconnected": "Disconnected"
 }

umap/static/umap/locale/fr.js

@@ -522,7 +522,8 @@ const locale = {
     "Wikipedia": "Wikipedia",
     "Save draft": "Enregistrer le brouillon",
     "No data has been found for import": "Aucunes données à importer",
-    "Successfully imported {count} feature(s)": "{count} élément(s) ajouté(s) à la carte"
+    "Successfully imported {count} feature(s)": "{count} élément(s) ajouté(s) à la carte",
+    "Disconnected": "Déconnecté"
 }
 L.registerLocale("fr", locale)
 L.setLocale("fr")

umap/static/umap/locale/fr.json

@@ -522,5 +522,6 @@
     "Wikipedia": "Wikipedia",
     "Save draft": "Enregistrer le brouillon",
     "No data has been found for import": "Aucunes données à importer",
-    "Successfully imported {count} feature(s)": "{count} élément(s) ajouté(s) à la carte"
+    "Successfully imported {count} feature(s)": "{count} élément(s) ajouté(s) à la carte",
+    "Disconnected": "Déconnecté"
 }

umap/static/umap/locale/zh_TW.js

@@ -183,12 +183,12 @@ const locale = {
     "Icon shape": "圖示圖形",
     "Icon symbol": "圖示標誌",
     "If false, the polygon or line will act as a part of the underlying map.": "選擇「否」時，多邊形物件會被當成為底圖的一部分。",
-    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}",
-    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}",
+    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "iframe 的自訂高度 (px)：{{{https://iframe.url.com|height}}}",
+    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "iframe 的自訂高度與寬度 (px)：{{{https://iframe.url.com|height*width}}}",
     "iframe": "iframe",
-    "Iframe: {{{https://iframe.url.com}}}": "Iframe: {{{https://iframe.url.com}}}",
-    "Image with custom width (in px): {{https://image.url.com|width}}": "Image with custom width (in px): {{https://image.url.com|width}}",
-    "Image: {{https://image.url.com}}": "Image: {{https://image.url.com}}",
+    "Iframe: {{{https://iframe.url.com}}}": "iframe：{{{https://iframe.url.com}}}",
+    "Image with custom width (in px): {{https://image.url.com|width}}": "圖片有自訂寬度 (px)：{{https://image.url.com|width}}",
+    "Image: {{https://image.url.com}}": "圖片：{{https://image.url.com}}",
     "Import data": "匯入資料",
     "Import in a new layer": "匯入至新圖層",
     "Imports all umap data, including layers and settings.": "匯入所有 umap 資料，包含圖層與設定。",
@@ -216,7 +216,7 @@ const locale = {
     "Limit bounds": "限制範圍",
     "Link to view the map": "檢視地圖的連結",
     "Link to…": "連結至...",
-    "Link with text: [[https://example.com|text of the link]]": "Link with text: [[https://example.com|text of the link]]",
+    "Link with text: [[https://example.com|text of the link]]": "有文字的連結：[[https://example.com|text of the link]]",
     "Long credits": "詳細工作人員名單",
     "Longitude": "經度",
     "Make main shape": "設為主要外形",
@@ -320,7 +320,7 @@ const locale = {
     "Show this layer in the caption": "在標題顯示此圖層",
     "Show/hide layer": "顯示/隱藏圖層",
     "Side panel": "側邊框",
-    "Simple link: [[https://example.com]]": "Simple link: [[https://example.com]]",
+    "Simple link: [[https://example.com]]": "簡單連結： [[https://example.com]]",
     "Simplify": "簡化",
     "Skipping unknown geometry.type: {type}": "略過不明的 geometry.type: {type}",
     "Slideshow": "投影片",
@@ -517,10 +517,12 @@ const locale = {
     "zoom to data extent": "切換至資料範圍",
     "download visible data": "下載可視資料",
     "{connectedPeers} peer(s) currently connected to this map": "這份地圖已經有 {connectedPeers} 伙伴連線",
-    "Import helpers": "Import helpers",
-    "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
-    "Wikipedia": "Wikipedia",
-    "Save draft": "Save draft"
+    "Import helpers": "匯入幫手",
+    "Import helpers will fill the URL field for you.": "匯入幫會為你填入網址",
+    "Wikipedia": "維基百科",
+    "Save draft": "儲存草稿",
+    "No data has been found for import": "匯入時沒有找到資料",
+    "Successfully imported {count} feature(s)": "成功匯入 {count} 圖徵"
 }
 L.registerLocale("zh_TW", locale)
 L.setLocale("zh_TW")