docs/changelog.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## 2.8.0a2 - 2024-12-13
-
-## Bug fixes
-* make sure we set X-DataLayer-Version even when using X-Accel-Redirect by @yohanboniface in #2361
-* refactor importer feedback by @yohanboniface in #2363
-
 ## 2.8.0a1 - 2024-12-11
 
 ### Internal changes

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.8.0a2"
+VERSION = "2.8.0a1"

umap/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-13 08:26+0000\n"
+"POT-Creation-Date: 2024-12-11 17:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -617,57 +617,57 @@ msgstr ""
 msgid "View the map"
 msgstr ""
 
-#: views.py:821
+#: views.py:820
 msgid "See full screen"
 msgstr ""
 
-#: views.py:964
+#: views.py:963
 msgid "Map editors updated with success!"
 msgstr ""
 
-#: views.py:1000
+#: views.py:999
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr ""
 
-#: views.py:1003
+#: views.py:1002
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr ""
 
-#: views.py:1010
+#: views.py:1009
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr ""
 
-#: views.py:1013
+#: views.py:1012
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr ""
 
-#: views.py:1024
+#: views.py:1023
 msgid "Only its owner can delete the map."
 msgstr ""
 
-#: views.py:1027
+#: views.py:1026
 msgid "Map successfully deleted."
 msgstr ""
 
-#: views.py:1053
+#: views.py:1052
 #, python-format
 msgid ""
 "Your map has been cloned! If you want to edit this map from another "
 "computer, please use this link: %(anonymous_url)s"
 msgstr ""
 
-#: views.py:1058
+#: views.py:1057
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:1309
+#: views.py:1308
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1331
+#: views.py:1330
 msgid "Permissions updated with success!"
 msgstr ""

umap/static/umap/js/modules/data/layer.js

@@ -252,11 +252,10 @@ export class DataLayer extends ServerStored {
   }
 
   fromGeoJSON(geojson, sync = true) {
-    const features = this.addData(geojson, sync)
+    this.addData(geojson, sync)
     this._geojson = geojson
     this.onDataLoaded()
     this.dataChanged()
-    return features
   }
 
   onDataLoaded() {
@@ -316,7 +315,7 @@ export class DataLayer extends ServerStored {
     const response = await this._umap.request.get(url)
     if (response?.ok) {
       this.clear()
-      return this._umap.formatter
+      this._umap.formatter
         .parse(await response.text(), this.options.remoteData.format)
         .then((geojson) => this.fromGeoJSON(geojson))
     }
@@ -444,11 +443,10 @@ export class DataLayer extends ServerStored {
     try {
       // Do not fail if remote data is somehow invalid,
       // otherwise the layer becomes uneditable.
-      return this.makeFeatures(geojson, sync)
+      this.makeFeatures(geojson, sync)
     } catch (err) {
       console.log('Error with DataLayer', this.id)
       console.error(err)
-      return []
     }
   }
 
@@ -465,13 +463,10 @@ export class DataLayer extends ServerStored {
       ? geojson
       : geojson.features || geojson.geometries
     if (!collection) return
-    const features = []
     this.sortFeatures(collection)
-    for (const featureJson of collection) {
-      const feature = this.makeFeature(featureJson, sync)
-      if (feature) features.push(feature)
+    for (const feature of collection) {
+      this.makeFeature(feature, sync)
     }
-    return features
   }
 
   makeFeature(geojson = {}, sync = true, id = null) {
@@ -508,47 +503,31 @@ export class DataLayer extends ServerStored {
   }
 
   async importRaw(raw, format) {
-    return this._umap.formatter
+    this._umap.formatter
       .parse(raw, format)
       .then((geojson) => this.addData(geojson))
-      .then((data) => {
-        if (data?.length) this.isDirty = true
-        return data
-      })
+      .then(() => this.zoomTo())
+    this.isDirty = true
   }
 
-  readFile(f) {
-    return new Promise((resolve) => {
-      const reader = new FileReader()
-      reader.onloadend = () => resolve(reader.result)
-      reader.readAsText(f)
-    })
-  }
-
-  async importFromFiles(files, type) {
-    let all = []
-    for (const file of files) {
-      const features = await this.importFromFile(file, type)
-      if (features) {
-        all = all.concat(features)
-      }
+  importFromFiles(files, type) {
+    for (const f of files) {
+      this.importFromFile(f, type)
     }
-    return new Promise((resolve) => {
-      resolve(all)
-    })
   }
 
-  async importFromFile(file, type) {
+  importFromFile(f, type) {
+    const reader = new FileReader()
     type = type || Utils.detectFileType(f)
-    const raw = await this.readFile(file)
-    return this.importRaw(raw, type)
+    reader.readAsText(f)
+    reader.onload = (e) => this.importRaw(e.target.result, type)
   }
 
   async importFromUrl(uri, type) {
     uri = this._umap.renderUrl(uri)
     const response = await this._umap.request.get(uri)
     if (response?.ok) {
-      return this.importRaw(await response.text(), type)
+      this.importRaw(await response.text(), type)
     }
   }
 
@@ -951,9 +930,9 @@ export class DataLayer extends ServerStored {
     else this.hide()
   }
 
-  zoomTo(bounds) {
+  zoomTo() {
     if (!this.isVisible()) return
-    bounds = bounds || this.layer.getBounds()
+    const bounds = this.layer.getBounds()
     if (bounds.isValid()) {
       const options = { maxZoom: this.getOption('zoomTo') }
       this._leafletMap.fitBounds(bounds, options)

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

@@ -1,8 +1,4 @@
-import {
-  DomEvent,
-  DomUtil,
-  LatLngBounds,
-} from '../../vendors/leaflet/leaflet-src.esm.js'
+import { DomEvent, DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../components/alerts/alert.js'
 import { translate } from './i18n.js'
 import { SCHEMA } from './schema.js'
@@ -274,12 +270,16 @@ export default class Importer extends Utils.WithTemplate {
   }
 
   submit() {
+    let hasErrors
     if (this.format === 'umap') {
-      this.full()
+      hasErrors = !this.full()
     } else if (!this.url) {
-      this.copy()
+      hasErrors = !this.copy()
     } else if (this.action) {
-      this[this.action]()
+      hasErrors = !this[this.action]()
+    }
+    if (hasErrors === false) {
+      Alert.info(translate('Data successfully imported!'))
     }
   }
 
@@ -294,9 +294,8 @@ export default class Importer extends Utils.WithTemplate {
       } else if (this.url) {
         this._umap.importFromUrl(this.url, this.format)
       }
-      this.onSuccess()
     } catch (e) {
-      this.onError(translate('Invalid umap data'))
+      Alert.error(translate('Invalid umap data'))
       console.error(e)
       return false
     }
@@ -307,7 +306,7 @@ export default class Importer extends Utils.WithTemplate {
       return false
     }
     if (!this.format) {
-      this.onError(translate('Please choose a format'))
+      Alert.error(translate('Please choose a format'))
       return false
     }
     const layer = this.layer
@@ -319,67 +318,26 @@ export default class Importer extends Utils.WithTemplate {
       layer.options.remoteData.proxy = true
       layer.options.remoteData.ttl = SCHEMA.ttl.default
     }
-    layer.fetchRemoteData(true).then((features) => {
-      if (features?.length) {
-        layer.zoomTo()
-        this.onSuccess()
-      } else {
-        this.onError()
-      }
-    })
+    layer.fetchRemoteData(true)
   }
 
-  async copy() {
+  copy() {
     // Format may be guessed from file later.
     // Usefull in case of multiple files with different formats.
     if (!this.format && !this.files.length) {
-      this.onError(translate('Please choose a format'))
+      Alert.error(translate('Please choose a format'))
       return false
     }
-    let promise
     const layer = this.layer
     if (this.clear) layer.empty()
     if (this.files.length) {
-      promise = layer.importFromFiles(this.files, this.format)
-    } else if (this.raw) {
-      promise = layer.importRaw(this.raw, this.format)
-    } else if (this.url) {
-      promise = layer.importFromUrl(this.url, this.format)
-    }
-    if (promise) promise.then((data) => this.onCopyFinished(layer, data))
-  }
-
-  onError(message = translate('No data has been found for import')) {
-    Alert.error(message)
-  }
-
-  onSuccess(count) {
-    if (count) {
-      Alert.success(
-        translate('Successfully imported {count} feature(s)', {
-          count: count,
-        })
-      )
-    } else {
-      Alert.success(translate('Data successfully imported!'))
-    }
-  }
-
-  onCopyFinished(layer, features) {
-    // undefined features means error, let original error message pop
-    if (!features) return
-    if (!features.length) {
-      this.onError()
-    } else {
-      const bounds = new LatLngBounds()
-      for (const feature of features) {
-        const featureBounds = feature.ui.getBounds
-          ? feature.ui.getBounds()
-          : feature.ui.getCenter()
-        bounds.extend(featureBounds)
+      for (const file of this.files) {
+        this._umap.processFileToImport(file, layer, this.format)
       }
-      this.onSuccess(features.length)
-      layer.zoomTo(bounds)
+    } else if (this.raw) {
+      layer.importRaw(this.raw, this.format)
+    } else if (this.url) {
+      layer.importFromUrl(this.url, this.format)
     }
   }
 }

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

@@ -316,14 +316,12 @@ export default class Umap extends ServerStored {
         dataUrl = this.renderUrl(dataUrl)
         dataUrl = this.proxyUrl(dataUrl)
         const datalayer = this.createDataLayer()
-        await datalayer
-          .importFromUrl(dataUrl, dataFormat)
-          .then(() => datalayer.zoomTo())
+        await datalayer.importFromUrl(dataUrl, dataFormat)
       }
     } else if (data) {
       data = decodeURIComponent(data)
       const datalayer = this.createDataLayer()
-      await datalayer.importRaw(data, dataFormat).then(() => datalayer.zoomTo())
+      await datalayer.importRaw(data, dataFormat)
     }
   }
 
@@ -643,12 +641,6 @@ 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')
   }
 
@@ -1522,7 +1514,7 @@ export default class Umap extends ServerStored {
   processFileToImport(file, layer, type) {
     type = type || Utils.detectFileType(file)
     if (!type) {
-      Alert.error(
+      U.Alert.error(
         translate('Unable to detect format of file {filename}', {
           filename: file.name,
         })

umap/static/umap/locale/en.js

@@ -520,9 +520,7 @@ const locale = {
     "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",
-    "No data has been found for import": "No data has been found for import",
-    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)"
+    "Save draft": "Save draft"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

umap/static/umap/locale/en.json

@@ -520,7 +520,5 @@
     "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",
-    "No data has been found for import": "No data has been found for import",
-    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)"
+    "Save draft": "Save draft"
 }

umap/static/umap/locale/fr.js

@@ -520,9 +520,7 @@ const locale = {
     "Import helpers": "Assistants d'import",
     "Import helpers will fill the URL field for you.": "Les assistants d'import vont renseigner le champ URL pour vous.",
     "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"
+    "Save draft": "Enregistrer le brouillon"
 }
 L.registerLocale("fr", locale)
 L.setLocale("fr")

umap/static/umap/locale/fr.json

@@ -520,7 +520,5 @@
     "Import helpers": "Assistants d'import",
     "Import helpers will fill the URL field for you.": "Les assistants d'import vont renseigner le champ URL pour vous.",
     "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"
+    "Save draft": "Enregistrer le brouillon"
 }

umap/views.py

@@ -452,27 +452,27 @@ showcase = MapsShowCase.as_view()
 
 
 def validate_url(request):
-    assert request.method == "GET", "Wrong HTTP method"
+    assert request.method == "GET"
     url = request.GET.get("url")
-    assert url, "Missing URL"
+    assert url
     try:
         URLValidator(url)
-    except ValidationError as err:
-        raise AssertionError(err)
-    assert "HTTP_REFERER" in request.META, "Missing HTTP_REFERER"
+    except ValidationError:
+        raise AssertionError()
+    assert "HTTP_REFERER" in request.META
     referer = urlparse(request.META.get("HTTP_REFERER"))
     toproxy = urlparse(url)
     local = urlparse(settings.SITE_URL)
-    assert toproxy.hostname, "No hostname"
-    assert referer.hostname == local.hostname, f"{referer.hostname} != {local.hostname}"
-    assert toproxy.hostname != "localhost", "Invalid localhost target"
-    assert toproxy.netloc != local.netloc, "Invalid netloc"
+    assert toproxy.hostname
+    assert referer.hostname == local.hostname
+    assert toproxy.hostname != "localhost"
+    assert toproxy.netloc != local.netloc
     try:
         # clean this when in python 3.4
         ipaddress = socket.gethostbyname(toproxy.hostname)
-    except Exception as err:
-        raise AssertionError(err)
-    assert not PRIVATE_IP.match(ipaddress), "Private IP"
+    except:
+        raise AssertionError()
+    assert not PRIVATE_IP.match(ipaddress)
     return url
 
 
@@ -480,8 +480,7 @@ class AjaxProxy(View):
     def get(self, *args, **kwargs):
         try:
             url = validate_url(self.request)
-        except AssertionError as err:
-            print(f"AjaxProxy: {err}")
+        except AssertionError:
             return HttpResponseBadRequest()
         try:
             ttl = int(self.request.GET.get("ttl"))