umap-project 2.1.2__py3-none-any.whl → 2.2.0__py3-none-any.whl

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

@@ -7,26 +7,32 @@ U.Importer = L.Class.extend({
 
   build: function () {
     this.container = L.DomUtil.create('div', 'umap-upload')
-    this.title = L.DomUtil.add('h3', '', this.container, L._('Import data'))
+    this.title = L.DomUtil.createTitle(
+      this.container,
+      L._('Import data'),
+      'icon-upload'
+    )
     this.presetBox = L.DomUtil.create('div', 'formbox', this.container)
     this.presetSelect = L.DomUtil.create('select', '', this.presetBox)
     this.fileBox = L.DomUtil.create('div', 'formbox', this.container)
-    this.fileInput = L.DomUtil.element(
-      'input',
-      { type: 'file', multiple: 'multiple', autofocus: true },
-      this.fileBox
-    )
-    this.map.ui.once('panel:closed', () => (this.fileInput.value = null))
-    this.urlInput = L.DomUtil.element(
-      'input',
-      { type: 'text', placeholder: L._('Provide an URL here') },
-      this.container
-    )
-    this.rawInput = L.DomUtil.element(
-      'textarea',
-      { placeholder: L._('Paste your data here') },
-      this.container
-    )
+    this.fileInput = L.DomUtil.element({
+      tagName: 'input',
+      type: 'file',
+      parent: this.fileBox,
+      multiple: 'multiple',
+      autofocus: true,
+    })
+    this.urlInput = L.DomUtil.element({
+      tagName: 'input',
+      type: 'text',
+      parent: this.container,
+      placeholder: L._('Provide an URL here'),
+    })
+    this.rawInput = L.DomUtil.element({
+      tagName: 'textarea',
+      parent: this.container,
+      placeholder: L._('Paste your data here'),
+    })
     this.typeLabel = L.DomUtil.add(
       'label',
       '',
@@ -39,47 +45,43 @@ U.Importer = L.Class.extend({
       this.container,
       L._('Choose the layer to import in')
     )
-    this.clearLabel = L.DomUtil.add(
-      'label',
-      '',
-      this.container,
-      L._('Replace layer content')
-    )
-    this.submitInput = L.DomUtil.element(
-      'input',
-      { type: 'button', value: L._('Import'), className: 'button' },
-      this.container
-    )
+    this.clearLabel = L.DomUtil.element({
+      tagName: 'label',
+      parent: this.container,
+      textContent: L._('Replace layer content'),
+      for: 'datalayer-clear-check',
+    })
+    this.submitInput = L.DomUtil.element({
+      tagName: 'input',
+      type: 'button',
+      parent: this.container,
+      value: L._('Import'),
+      className: 'button',
+    })
     this.map.help.button(this.typeLabel, 'importFormats')
-    this.typeInput = L.DomUtil.element('select', { name: 'format' }, this.typeLabel)
-    this.layerInput = L.DomUtil.element(
-      'select',
-      { name: 'datalayer' },
-      this.layerLabel
-    )
-    this.clearFlag = L.DomUtil.element(
-      'input',
-      { type: 'checkbox', name: 'clear' },
-      this.clearLabel
-    )
-    let option
-    this.map.eachDataLayerReverse((datalayer) => {
-      if (datalayer.isLoaded() && !datalayer.isRemoteLayer()) {
-        const id = L.stamp(datalayer)
-        option = L.DomUtil.add('option', '', this.layerInput, datalayer.options.name)
-        option.value = id
-      }
+    this.typeInput = L.DomUtil.element({
+      tagName: 'select',
+      name: 'format',
+      parent: this.typeLabel,
+    })
+    this.layerInput = L.DomUtil.element({
+      tagName: 'select',
+      name: 'datalayer',
+      parent: this.layerLabel,
+    })
+    this.clearFlag = L.DomUtil.element({
+      tagName: 'input',
+      type: 'checkbox',
+      name: 'clear',
+      id: 'datalayer-clear-check',
+      parent: this.clearLabel,
+    })
+    L.DomUtil.element({
+      tagName: 'option',
+      value: '',
+      textContent: L._('Choose the data format'),
+      parent: this.typeInput,
     })
-    L.DomUtil.element(
-      'option',
-      { value: '', textContent: L._('Import in a new layer') },
-      this.layerInput
-    )
-    L.DomUtil.element(
-      'option',
-      { value: '', textContent: L._('Choose the data format') },
-      this.typeInput
-    )
     for (let i = 0; i < this.TYPES.length; i++) {
       option = L.DomUtil.create('option', '', this.typeInput)
       option.value = option.textContent = this.TYPES[i]
@@ -103,7 +105,7 @@ U.Importer = L.Class.extend({
         let type = '',
           newType
         for (let i = 0; i < e.target.files.length; i++) {
-          newType = L.Util.detectFileType(e.target.files[i])
+          newType = U.Utils.detectFileType(e.target.files[i])
           if (!type && newType) type = newType
           if (type && newType !== type) {
             type = ''
@@ -118,7 +120,25 @@ U.Importer = L.Class.extend({
 
   open: function () {
     if (!this.container) this.build()
-    this.map.ui.openPanel({ data: { html: this.container }, className: 'dark' })
+    const onLoad = this.map.editPanel.open({ content: this.container })
+    onLoad.then(() => {
+      this.fileInput.value = null
+      this.layerInput.innerHTML = ''
+      let option
+      this.map.eachDataLayerReverse((datalayer) => {
+        if (datalayer.isLoaded() && !datalayer.isRemoteLayer()) {
+          const id = L.stamp(datalayer)
+          option = L.DomUtil.add('option', '', this.layerInput, datalayer.options.name)
+          option.value = id
+        }
+      })
+      L.DomUtil.element({
+        tagName: 'option',
+        value: '',
+        textContent: L._('Import in a new layer'),
+        parent: this.layerInput,
+      })
+    })
   },
 
   openFiles: function () {