umap-project 2.8.0a0__py3-none-any.whl → 2.8.0a2__py3-none-any.whl

umap/__init__.py

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

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-11 17:05+0000\n"
+"POT-Creation-Date: 2024-12-13 08:26+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:820
+#: views.py:821
 msgid "See full screen"
 msgstr ""
 
-#: views.py:963
+#: views.py:964
 msgid "Map editors updated with success!"
 msgstr ""
 
-#: views.py:999
+#: views.py:1000
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr ""
 
-#: views.py:1002
+#: views.py:1003
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr ""
 
-#: views.py:1009
+#: views.py:1010
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr ""
 
-#: views.py:1012
+#: views.py:1013
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr ""
 
-#: views.py:1023
+#: views.py:1024
 msgid "Only its owner can delete the map."
 msgstr ""
 
-#: views.py:1026
+#: views.py:1027
 msgid "Map successfully deleted."
 msgstr ""
 
-#: views.py:1052
+#: views.py:1053
 #, 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:1057
+#: views.py:1058
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:1308
+#: views.py:1309
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1330
+#: views.py:1331
 msgid "Permissions updated with success!"
 msgstr ""

umap/management/commands/empty_trash.py

@@ -23,10 +23,13 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         days = options["days"]
-        since = datetime.utcnow() - timedelta(days=days)
+        since = (datetime.utcnow() - timedelta(days=days)).date()
         print(f"Deleting map in trash since {since}")
         maps = Map.objects.filter(share_status=Map.DELETED, modified_at__lt=since)
         for map in maps:
+            map_id = map.id
+            map_name = map.name
+            trashed_at = map.modified_at.date()
             if not options["dry_run"]:
                 map.delete()
-            print(f"Deleted map {map.name} ({map.id}), trashed on {map.modified_at}")
+            print(f"Deleted map {map_name} ({map_id}), trashed at {trashed_at}")

umap/management/commands/migrate_to_S3.py

@@ -2,7 +2,7 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 
 from umap.models import DataLayer
-from umap.storage import UmapFileSystem
+from umap.storage.fs import FSDataStorage
 
 
 class Command(BaseCommand):
@@ -11,9 +11,9 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         assert settings.UMAP_READONLY, "You must run that script with a read-only uMap."
         assert (
-            settings.STORAGES["data"]["BACKEND"] == "umap.storage.UmapS3"
+            settings.STORAGES["data"]["BACKEND"] == "umap.storage.s3.S3DataStorage"
         ), "You must configure your storages to point to S3"
-        fs_storage = UmapFileSystem()
+        fs_storage = FSDataStorage()
         for datalayer in DataLayer.objects.all():
             geojson_fs_path = str(datalayer.geojson)
             try:

umap/settings/base.py

@@ -176,10 +176,10 @@ STORAGES = {
         "BACKEND": "django.core.files.storage.FileSystemStorage",
     },
     "data": {
-        "BACKEND": "umap.storage.UmapFileSystem",
+        "BACKEND": "umap.storage.fs.FSDataStorage",
     },
     "staticfiles": {
-        "BACKEND": "umap.storage.UmapManifestStaticFilesStorage",
+        "BACKEND": "umap.storage.staticfiles.UmapManifestStaticFilesStorage",
     },
 }
 # Add application/json and application/geo+json to default django-storages setting

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

@@ -252,10 +252,11 @@ export class DataLayer extends ServerStored {
   }
 
   fromGeoJSON(geojson, sync = true) {
-    this.addData(geojson, sync)
+    const features = this.addData(geojson, sync)
     this._geojson = geojson
     this.onDataLoaded()
     this.dataChanged()
+    return features
   }
 
   onDataLoaded() {
@@ -315,7 +316,7 @@ export class DataLayer extends ServerStored {
     const response = await this._umap.request.get(url)
     if (response?.ok) {
       this.clear()
-      this._umap.formatter
+      return this._umap.formatter
         .parse(await response.text(), this.options.remoteData.format)
         .then((geojson) => this.fromGeoJSON(geojson))
     }
@@ -443,10 +444,11 @@ export class DataLayer extends ServerStored {
     try {
       // Do not fail if remote data is somehow invalid,
       // otherwise the layer becomes uneditable.
-      this.makeFeatures(geojson, sync)
+      return this.makeFeatures(geojson, sync)
     } catch (err) {
       console.log('Error with DataLayer', this.id)
       console.error(err)
+      return []
     }
   }
 
@@ -463,10 +465,13 @@ export class DataLayer extends ServerStored {
       ? geojson
       : geojson.features || geojson.geometries
     if (!collection) return
+    const features = []
     this.sortFeatures(collection)
-    for (const feature of collection) {
-      this.makeFeature(feature, sync)
+    for (const featureJson of collection) {
+      const feature = this.makeFeature(featureJson, sync)
+      if (feature) features.push(feature)
     }
+    return features
   }
 
   makeFeature(geojson = {}, sync = true, id = null) {
@@ -503,31 +508,47 @@ export class DataLayer extends ServerStored {
   }
 
   async importRaw(raw, format) {
-    this._umap.formatter
+    return this._umap.formatter
       .parse(raw, format)
       .then((geojson) => this.addData(geojson))
-      .then(() => this.zoomTo())
-    this.isDirty = true
+      .then((data) => {
+        if (data?.length) this.isDirty = true
+        return data
+      })
   }
 
-  importFromFiles(files, type) {
-    for (const f of files) {
-      this.importFromFile(f, type)
+  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)
+      }
     }
+    return new Promise((resolve) => {
+      resolve(all)
+    })
   }
 
-  importFromFile(f, type) {
-    const reader = new FileReader()
+  async importFromFile(file, type) {
     type = type || Utils.detectFileType(f)
-    reader.readAsText(f)
-    reader.onload = (e) => this.importRaw(e.target.result, type)
+    const raw = await this.readFile(file)
+    return this.importRaw(raw, type)
   }
 
   async importFromUrl(uri, type) {
     uri = this._umap.renderUrl(uri)
     const response = await this._umap.request.get(uri)
     if (response?.ok) {
-      this.importRaw(await response.text(), type)
+      return this.importRaw(await response.text(), type)
     }
   }
 
@@ -930,9 +951,9 @@ export class DataLayer extends ServerStored {
     else this.hide()
   }
 
-  zoomTo() {
+  zoomTo(bounds) {
     if (!this.isVisible()) return
-    const bounds = this.layer.getBounds()
+    bounds = 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,4 +1,8 @@
-import { DomEvent, DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
+import {
+  DomEvent,
+  DomUtil,
+  LatLngBounds,
+} 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'
@@ -270,16 +274,12 @@ export default class Importer extends Utils.WithTemplate {
   }
 
   submit() {
-    let hasErrors
     if (this.format === 'umap') {
-      hasErrors = !this.full()
+      this.full()
     } else if (!this.url) {
-      hasErrors = !this.copy()
+      this.copy()
     } else if (this.action) {
-      hasErrors = !this[this.action]()
-    }
-    if (hasErrors === false) {
-      Alert.info(translate('Data successfully imported!'))
+      this[this.action]()
     }
   }
 
@@ -294,8 +294,9 @@ export default class Importer extends Utils.WithTemplate {
       } else if (this.url) {
         this._umap.importFromUrl(this.url, this.format)
       }
+      this.onSuccess()
     } catch (e) {
-      Alert.error(translate('Invalid umap data'))
+      this.onError(translate('Invalid umap data'))
       console.error(e)
       return false
     }
@@ -306,7 +307,7 @@ export default class Importer extends Utils.WithTemplate {
       return false
     }
     if (!this.format) {
-      Alert.error(translate('Please choose a format'))
+      this.onError(translate('Please choose a format'))
       return false
     }
     const layer = this.layer
@@ -318,26 +319,65 @@ export default class Importer extends Utils.WithTemplate {
       layer.options.remoteData.proxy = true
       layer.options.remoteData.ttl = SCHEMA.ttl.default
     }
-    layer.fetchRemoteData(true)
+    layer.fetchRemoteData(true).then((features) => {
+      if (features?.length) {
+        layer.zoomTo()
+        this.onSuccess()
+      } else {
+        this.onError()
+      }
+    })
   }
 
-  copy() {
+  async copy() {
     // Format may be guessed from file later.
     // Usefull in case of multiple files with different formats.
     if (!this.format && !this.files.length) {
-      Alert.error(translate('Please choose a format'))
+      this.onError(translate('Please choose a format'))
       return false
     }
+    let promise
     const layer = this.layer
     if (this.clear) layer.empty()
     if (this.files.length) {
-      for (const file of this.files) {
-        this._umap.processFileToImport(file, layer, this.format)
-      }
+      promise = layer.importFromFiles(this.files, this.format)
     } else if (this.raw) {
-      layer.importRaw(this.raw, this.format)
+      promise = layer.importRaw(this.raw, this.format)
     } else if (this.url) {
-      layer.importFromUrl(this.url, this.format)
+      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)
+      }
+      this.onSuccess(features.length)
+      layer.zoomTo(bounds)
     }
   }
 }

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

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

umap/static/umap/locale/en.js

@@ -520,7 +520,9 @@ 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"
+    "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)"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

umap/static/umap/locale/en.json

@@ -520,5 +520,7 @@
     "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"
+    "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)"
 }

umap/static/umap/locale/fr.js

@@ -520,7 +520,9 @@ 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"
+    "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"
 }
 L.registerLocale("fr", locale)
 L.setLocale("fr")

umap/static/umap/locale/fr.json

@@ -520,5 +520,7 @@
     "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"
+    "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"
 }

umap/storage/__init__.py

@@ -0,0 +1,3 @@
+# Retrocompat
+
+from .staticfiles import UmapManifestStaticFilesStorage  # noqa: F401

umap/storage/fs.py

@@ -0,0 +1,101 @@
+import operator
+import os
+import time
+from pathlib import Path
+
+from django.conf import settings
+from django.core.files.storage import FileSystemStorage
+
+
+class FSDataStorage(FileSystemStorage):
+    def get_reference_version(self, instance):
+        return self._extract_version_ref(instance.geojson.name)
+
+    def make_filename(self, instance):
+        root = self._base_path(instance)
+        name = "%s_%s.geojson" % (instance.pk, int(time.time() * 1000))
+        return root / name
+
+    def list_versions(self, instance):
+        root = self._base_path(instance)
+        names = self.listdir(root)[1]
+        names = [name for name in names if self._is_valid_version(name, instance)]
+        versions = [self._version_metadata(name, instance) for name in names]
+        versions.sort(reverse=True, key=operator.itemgetter("at"))
+        return versions
+
+    def get_version(self, ref, instance):
+        with self.open(self.get_version_path(ref, instance), "r") as f:
+            return f.read()
+
+    def get_version_path(self, ref, instance):
+        base_path = Path(settings.MEDIA_ROOT) / self._base_path(instance)
+        fullpath = base_path / f"{instance.pk}_{ref}.geojson"
+        if instance.old_id and not fullpath.exists():
+            fullpath = base_path / f"{instance.old_id}_{ref}.geojson"
+        if not fullpath.exists():
+            raise ValueError(f"Invalid version reference: {ref}")
+        return fullpath
+
+    def onDatalayerSave(self, instance):
+        self._purge_gzip(instance)
+        self._purge_old_versions(instance, keep=settings.UMAP_KEEP_VERSIONS)
+
+    def onDatalayerDelete(self, instance):
+        self._purge_gzip(instance)
+        self._purge_old_versions(instance, keep=None)
+
+    def _extract_version_ref(self, path):
+        version = path.split(".")[0]
+        if "_" in version:
+            return version.split("_")[-1]
+        return version
+
+    def _base_path(self, instance):
+        path = ["datalayer", str(instance.map.pk)[-1]]
+        if len(str(instance.map.pk)) > 1:
+            path.append(str(instance.map.pk)[-2])
+        path.append(str(instance.map.pk))
+        return Path(os.path.join(*path))
+
+    def _is_valid_version(self, name, instance):
+        valid_prefixes = [name.startswith("%s_" % instance.pk)]
+        if instance.old_id:
+            valid_prefixes.append(name.startswith("%s_" % instance.old_id))
+        return any(valid_prefixes) and name.endswith(".geojson")
+
+    def _version_metadata(self, name, instance):
+        ref = self._extract_version_ref(name)
+        return {
+            "name": name,
+            "ref": ref,
+            "at": ref,
+            "size": self.size(self._base_path(instance) / name),
+        }
+
+    def _purge_old_versions(self, instance, keep=None):
+        root = self._base_path(instance)
+        versions = self.list_versions(instance)
+        if keep is not None:
+            versions = versions[keep:]
+        for version in versions:
+            name = version["name"]
+            # Should not be in the list, but ensure to not delete the file
+            # currently used in database
+            if keep is not None and instance.geojson.name.endswith(name):
+                continue
+            try:
+                self.delete(root / name)
+            except FileNotFoundError:
+                pass
+
+    def _purge_gzip(self, instance):
+        root = self._base_path(instance)
+        names = self.listdir(root)[1]
+        prefixes = [f"{instance.pk}_"]
+        if instance.old_id:
+            prefixes.append(f"{instance.old_id}_")
+        prefixes = tuple(prefixes)
+        for name in names:
+            if name.startswith(prefixes) and name.endswith(".gz"):
+                self.delete(root / name)

umap/storage/s3.py

@@ -0,0 +1,61 @@
+from gzip import GzipFile
+
+from django.core.exceptions import ImproperlyConfigured
+
+try:
+    from botocore.exceptions import ClientError
+    from storages.backends.s3 import S3Storage
+except ImportError:
+    raise ImproperlyConfigured(
+        "You need to install s3 dependencies: pip install umap-project[s3]"
+    )
+
+
+class S3DataStorage(S3Storage):
+    gzip = True
+
+    def get_reference_version(self, instance):
+        metadata = self.connection.meta.client.head_object(
+            Bucket=self.bucket_name, Key=instance.geojson.name
+        )
+        # Do not fail if bucket does not handle versioning
+        return metadata.get("VersionId", metadata["ETag"])
+
+    def make_filename(self, instance):
+        return f"{str(instance.pk)}.geojson"
+
+    def list_versions(self, instance):
+        response = self.connection.meta.client.list_object_versions(
+            Bucket=self.bucket_name, Prefix=instance.geojson.name
+        )
+        return [
+            {
+                "ref": version["VersionId"],
+                "at": version["LastModified"].timestamp() * 1000,
+                "size": version["Size"],
+            }
+            for version in response["Versions"]
+        ]
+
+    def get_version(self, ref, instance):
+        try:
+            data = self.connection.meta.client.get_object(
+                Bucket=self.bucket_name,
+                Key=instance.geojson.name,
+                VersionId=ref,
+            )
+        except ClientError:
+            raise ValueError(f"Invalid version reference: {ref}")
+        return GzipFile(mode="r", fileobj=data["Body"]).read()
+
+    def get_version_path(self, ref, instance):
+        return self.url(instance.geojson.name, parameters={"VersionId": ref})
+
+    def onDatalayerSave(self, instance):
+        pass
+
+    def onDatalayerDelete(self, instance):
+        return self.connection.meta.client.delete_object(
+            Bucket=self.bucket_name,
+            Key=instance.geojson.name,
+        )

umap/storage/staticfiles.py

@@ -0,0 +1,64 @@
+from pathlib import Path
+
+from django.conf import settings
+from django.contrib.staticfiles.storage import ManifestStaticFilesStorage
+from rcssmin import cssmin
+from rjsmin import jsmin
+
+
+class UmapManifestStaticFilesStorage(ManifestStaticFilesStorage):
+    support_js_module_import_aggregation = True
+    max_post_process_passes = 15
+
+    # We remove `;` at the end of all regexps to match our biome config.
+    _js_module_import_aggregation_patterns = (
+        "*.js",
+        (
+            (
+                (
+                    r"""(?P<matched>import(?s:(?P<import>[\s\{].*?))"""
+                    r"""\s*from\s*['"](?P<url>[\.\/].*?)["']\s*)"""
+                ),
+                'import%(import)s from "%(url)s"\n',
+            ),
+            (
+                (
+                    r"""(?P<matched>export(?s:(?P<exports>[\s\{].*?))"""
+                    r"""\s*from\s*["'](?P<url>[\.\/].*?)["']\s*)"""
+                ),
+                'export%(exports)s from "%(url)s"\n',
+            ),
+            (
+                r"""(?P<matched>import\s*['"](?P<url>[\.\/].*?)["']\s*)""",
+                'import"%(url)s"\n',
+            ),
+            (
+                r"""(?P<matched>import\(["'](?P<url>.*?)["']\)\.then)""",
+                """import("%(url)s").then""",
+            ),
+            (
+                r"""(?P<matched>await import\(["'](?P<url>.*?)["']\))""",
+                """await import("%(url)s")""",
+            ),
+        ),
+    )
+
+    def post_process(self, paths, **options):
+        collected = super().post_process(paths, **options)
+        for original_path, processed_path, processed in collected:
+            if isinstance(processed, Exception):
+                print("Error with file", original_path)
+                raise processed
+            if processed_path.endswith(".js"):
+                path = Path(settings.STATIC_ROOT) / processed_path
+                initial = path.read_text()
+                if "sourceMappingURL" not in initial:  # Already minified.
+                    minified = jsmin(initial)
+                    path.write_text(minified)
+            if processed_path.endswith(".css"):
+                path = Path(settings.STATIC_ROOT) / processed_path
+                initial = path.read_text()
+                if "sourceMappingURL" not in initial:  # Already minified.
+                    minified = cssmin(initial)
+                    path.write_text(minified)
+            yield original_path, processed_path, True

umap/tests/test_datalayer_s3.py

@@ -27,7 +27,7 @@ def patch_storage():
 
     DataLayer.geojson.field.storage = storages.create_storage(
         {
-            "BACKEND": "umap.storage.UmapS3",
+            "BACKEND": "umap.storage.s3.S3DataStorage",
             "OPTIONS": {
                 "access_key": "testing",
                 "secret_key": "testing",

umap/tests/test_statics.py

@@ -15,7 +15,7 @@ def staticfiles(settings):
     # Make sure settings are properly reset after the test
     settings.STORAGES = deepcopy(settings.STORAGES)
     settings.STORAGES["staticfiles"]["BACKEND"] = (
-        "umap.storage.UmapManifestStaticFilesStorage"
+        "umap.storage.staticfiles.UmapManifestStaticFilesStorage"
     )
     try:
         call_command("collectstatic", "--noinput")

umap/views.py

@@ -452,27 +452,27 @@ showcase = MapsShowCase.as_view()
 
 
 def validate_url(request):
-    assert request.method == "GET"
+    assert request.method == "GET", "Wrong HTTP method"
     url = request.GET.get("url")
-    assert url
+    assert url, "Missing URL"
     try:
         URLValidator(url)
-    except ValidationError:
-        raise AssertionError()
-    assert "HTTP_REFERER" in request.META
+    except ValidationError as err:
+        raise AssertionError(err)
+    assert "HTTP_REFERER" in request.META, "Missing HTTP_REFERER"
     referer = urlparse(request.META.get("HTTP_REFERER"))
     toproxy = urlparse(url)
     local = urlparse(settings.SITE_URL)
-    assert toproxy.hostname
-    assert referer.hostname == local.hostname
-    assert toproxy.hostname != "localhost"
-    assert toproxy.netloc != local.netloc
+    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"
     try:
         # clean this when in python 3.4
         ipaddress = socket.gethostbyname(toproxy.hostname)
-    except:
-        raise AssertionError()
-    assert not PRIVATE_IP.match(ipaddress)
+    except Exception as err:
+        raise AssertionError(err)
+    assert not PRIVATE_IP.match(ipaddress), "Private IP"
     return url
 
 
@@ -480,7 +480,8 @@ class AjaxProxy(View):
     def get(self, *args, **kwargs):
         try:
             url = validate_url(self.request)
-        except AssertionError:
+        except AssertionError as err:
+            print(f"AjaxProxy: {err}")
             return HttpResponseBadRequest()
         try:
             ttl = int(self.request.GET.get("ttl"))
@@ -1168,7 +1169,7 @@ class DataLayerView(BaseDetailView):
             # (no gzip/cache-control/If-Modified-Since/If-None-Match)
             data = self.filedata
             response = HttpResponse(data, content_type="application/geo+json")
-            response["X-Datalayer-Version"] = self.fileversion
+        response["X-Datalayer-Version"] = self.fileversion
         return response
 
 

{umap_project-2.8.0a0.dist-info → umap_project-2.8.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.8.0a0
+Version: 2.8.0a2
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>

{umap_project-2.8.0a0.dist-info → umap_project-2.8.0a2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-umap/__init__.py,sha256=2KCwAhPAdl9iGZ4OqB3b9x9oEMjwYBXpF7OB99CO7m8,20
+umap/__init__.py,sha256=0_15wRSL9SkA85FevSlxLo6H6SAySXR0t2XW5TtIIQA,20
 umap/admin.py,sha256=LoQytPGK6pLBqZ5QgQ9DIPAxhTG31cTtHOCqO9BY5S4,2645
 umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
 umap/asgi.py,sha256=CuVSNBwNb4AvuaD_Ha3ehtvf-c46ijZoVOSoP6WhXp8,432
@@ -10,10 +10,9 @@ umap/forms.py,sha256=fonoSwA02LawR7kXbjEZCH0ZYi53fAbRHYgW2RaqeYw,3803
 umap/managers.py,sha256=-lBK0xYFRDfX76qDRdLnZOA8jEPYseEwIj8QOiHVM4w,243
 umap/middleware.py,sha256=p8EPW_gYW8Wh2lk0DNIAkZQbYlBZugW7Yq4iiA7L4aE,514
 umap/models.py,sha256=4SzhKdyWXfJMdzEpCyVPnzbTT-TGbDusAy7SP_8UuwI,17929
-umap/storage.py,sha256=kEzS0BP9jrfVwlUtmEcf4W0t-7uEBqFfgKBlKvQTRVg,7900
 umap/urls.py,sha256=LA3zxyu-GDo8kVqdyU7_bdbDGhDJV8_yFW4oEPTXw4s,7559
 umap/utils.py,sha256=19i8ibi-1IXxafT4k_yOHMhD-DsPH74Ll9qw-UrUkM4,5856
-umap/views.py,sha256=xSKBdbRFtoA0RXm5qCrVAoir4gm0_rN7d-70Nzbg0pQ,46016
+umap/views.py,sha256=hMBxefWDUZQUVUb5C477cVyL7hp7OfppZlu4_sw9L4o,46266
 umap/websocket_server.py,sha256=D9sTHhKg0DG37b8bw7KWTKMDc6TPyTkNLCVkh2mlFOo,6604
 umap/wsgi.py,sha256=IopIgnDZbCus3XpSetTHnra9VyzWi0Y2tJo-CmfTWCY,1132
 umap/bin/__init__.py,sha256=iA3ON4A6NCpenrn3q2OgefUKF5QRFIQS-FtS0pxruI8,234
@@ -38,7 +37,7 @@ umap/locale/de/LC_MESSAGES/django.po,sha256=kVaio9t9AKF3vBcZJ-Q2P6Ua90MIwbIRCABW
 umap/locale/el/LC_MESSAGES/django.mo,sha256=bJOH3_UQZoEfYi9mrsWHZfV6fVhMgnuiNQ_Dc_xOcuA,15058
 umap/locale/el/LC_MESSAGES/django.po,sha256=ruqAlyQryr7Ip5aTbjEwH6eumb_b8JS-u6qcl9yjN04,22180
 umap/locale/en/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
-umap/locale/en/LC_MESSAGES/django.po,sha256=RCM-hylLym43OQaDWCABqnHAyip57gwj4P_UNfyr3oU,13627
+umap/locale/en/LC_MESSAGES/django.po,sha256=Ht498JmD3Zp08W7qpOjJBTngf6oSMW2pR5dT3OneL5Q,13628
 umap/locale/es/LC_MESSAGES/django.mo,sha256=rblKBhki-DnIAVxbo2UCYQCIte1dqRZDyAjDQCJgKug,11985
 umap/locale/es/LC_MESSAGES/django.po,sha256=E0xSceHtg4CkgSHT2mFPRdiBP9n8c-PnKDXHQgAgStA,18690
 umap/locale/et/LC_MESSAGES/django.mo,sha256=Y5ulivMuS2IOR9ITeWRx6PBynPn6LBFUizrFWRraR1s,5051
@@ -115,10 +114,10 @@ umap/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/management/commands/anonymous_edit_url.py,sha256=hsWgPzZJmLCoDKTWziFUuwq-DdnSiXkSal2t2TIED-s,1070
 umap/management/commands/clean_tilelayer.py,sha256=Rcc2PibUUreU0jUZMtUlyqVvgbQMLMuuCZ2tkrzRqHU,5712
-umap/management/commands/empty_trash.py,sha256=guGnu72EYOiRtS-pLjxByFOmFtq1Ra0JR0SWBOZDOsY,1024
+umap/management/commands/empty_trash.py,sha256=POmBXloLoPZ_6MFbgsDz4YOKGmEwIWrvMt5v5QMi7ZM,1136
 umap/management/commands/generate_js_locale.py,sha256=wkf-PFIHS7m4ZhyL1ZRMBLqyUeY2SlOrTXS42tE0-bs,1281
 umap/management/commands/import_pictograms.py,sha256=RuQDCoiKamba4l3fZUGAXRyd-3zwWWT5c5AhgDvs7AQ,2369
-umap/management/commands/migrate_to_S3.py,sha256=-LVbLdr554mjhdSty1OE_33OI4CjdegqQZr2Fw2JeSk,1119
+umap/management/commands/migrate_to_S3.py,sha256=GBGnydc107v75NYsQfMLLO7Jx0i2g7EKEfE00YZVb1M,1130
 umap/management/commands/run_websocket_server.py,sha256=TyECJWnmZ95KpVEWSaqfXywz5VwIEzPdypU2d6V541c,648
 umap/migrations/0001_initial.py,sha256=dMcXtTKPiA0IqXCrDVctH91Fe0hhc04NxmvcLAULyzE,8787
 umap/migrations/0002_tilelayer_tms.py,sha256=E99JAu1K0NzwsCEJs1z5uGlBkBJmoVb9a3WBKjpLYlo,372
@@ -147,7 +146,7 @@ umap/migrations/0024_alter_map_share_status.py,sha256=QRjERy2XN0jsc8MM5cCba5freq
 umap/migrations/0025_alter_datalayer_geojson.py,sha256=958v9AkpkAR5Q78ZcHC0fgZzN05BdfQwtNvUuPmWEvI,563
 umap/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/settings/__init__.py,sha256=aPJkOTk0uFusIBA-uOjdUi10R5Cxt4jl5yv2_uCTUvo,1702
-umap/settings/base.py,sha256=zdJa2Qqq1hlsFh80YFhOiNEs1cWa9ZAE5zzygpmHgKE,11082
+umap/settings/base.py,sha256=rhaIDby2wSb4v8IBx_6xqHVnIigD4G0xzdHX2-9UfNM,11096
 umap/settings/dev.py,sha256=pj1mpmZXiI2syW8pB01wcVeqCFABF3V-nlOxArir4cw,386
 umap/settings/local.py.sample,sha256=wpnoe7qtXer_xBuhWbcbqcSCotTJRu6h8hG7N-sD0b4,3157
 umap/static/.gitignore,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -238,7 +237,7 @@ umap/static/umap/js/modules/formatter.js,sha256=drbIxbDGrcHOUtzJtC4B5iKpm8-YNg_b
 umap/static/umap/js/modules/global.js,sha256=7jm6NLZ5PM2yrkbWHdWkoDFcevgIAMqE-vZQRXcIgEo,934
 umap/static/umap/js/modules/help.js,sha256=0vsDTFGcPz2coG_LBeGPSUQupZTFUes6kCwQCPBUjuU,9694
 umap/static/umap/js/modules/i18n.js,sha256=dEpjsWoEZa-Tr5_MDO0tuWkt7kLL3crxXqhttyP-khU,1387
-umap/static/umap/js/modules/importer.js,sha256=hfFXTXtyCueeEZrs-cq6EAnicgRANzijbhoihYFT-RE,10000
+umap/static/umap/js/modules/importer.js,sha256=6wqs2z-jrfcwvSFvmPuJWDnP9s1dUEe2Oi1ili3FZ0M,10961
 umap/static/umap/js/modules/leaflet-configure.js,sha256=P3aD8iNGxuVNv-xW4Di4txAjNmnlpKtCCzDvPaKEdQ8,243
 umap/static/umap/js/modules/orderable.js,sha256=zDtcElZ_MVPoGba8Iv9bxOzk4vuN7C-5XVl4UomDYHE,2521
 umap/static/umap/js/modules/permissions.js,sha256=RxKrfjLo6hdGuAvwQrzUUJJznD5RkmSkAHVMidA9iKQ,8497
@@ -249,11 +248,11 @@ umap/static/umap/js/modules/schema.js,sha256=RuBO5obpccTPH_iPXRU-lwyj1SoX9bp619t
 umap/static/umap/js/modules/share.js,sha256=s1X59VpMqut_Vhg7l7LV2IZDm9obRVbDH9wZbG5kX3c,7182
 umap/static/umap/js/modules/slideshow.js,sha256=zcRzOMkJvhps1npGRjHkdK4Ce3UkqOsv8OsDgQWO-bg,3567
 umap/static/umap/js/modules/tableeditor.js,sha256=6p2YE2-NF4NkwLDQkqrl90P_PwOYdFao0-ac_AkOwWs,9854
-umap/static/umap/js/modules/umap.js,sha256=n509OKscghGTM_sXlvcobVdJG36NRpeQA5pIlmEaUDI,49989
+umap/static/umap/js/modules/umap.js,sha256=VSU8p94tLKZBGeL1NWWmrsT81RTZNW1oROOxsUqeAxI,50071
 umap/static/umap/js/modules/urls.js,sha256=76cFqycj2O8huuoYYBvxnVt2Fc2UDbgrRsiv6lQmcSY,890
 umap/static/umap/js/modules/utils.js,sha256=fYzo-WjRzDZsdjv3CI9U4Es3AqOfuBCJuRq997m2EfQ,12309
 umap/static/umap/js/modules/data/features.js,sha256=rd5WpZoai3u4baWxi_8m2vtwGLuI-9hdH4PGnrjqg_4,31667
-umap/static/umap/js/modules/data/layer.js,sha256=WhB0ZSaNpI082JKL28EYLjY2fhoIXdOhMwn8JDuqtqM,34530
+umap/static/umap/js/modules/data/layer.js,sha256=uLEVGp3gFq7obA9Ij-RVz-VWqo9SwLQd1uBzmaKYo9o,35101
 umap/static/umap/js/modules/importers/cadastrefr.js,sha256=KHqxHleFRFzNi98gegvUM1R6eJorAGGcMft_ktUg-ug,2262
 umap/static/umap/js/modules/importers/communesfr.js,sha256=6q6ilmYhhuSmgdrvfTyEDNyMLbc9J9Bt8VMZVXB8ZOA,1723
 umap/static/umap/js/modules/importers/datasets.js,sha256=StZbRiq_1vqe0OO1w66k5Lwzju8RntmHpWe9HWIDfRE,1372
@@ -298,8 +297,8 @@ umap/static/umap/locale/de.js,sha256=wUAKh3L1vhrHH819XeKeLalw8GOhjh5G-yErBUDY4R0
 umap/static/umap/locale/de.json,sha256=cM1Q4WS2qCtQebyUHnHmblS4aj9j4TooDwk_nSQ8pqs,32723
 umap/static/umap/locale/el.js,sha256=aK9fBOMEaQf-a3IU3lEhJ5qeDNRtHIR5k_WD0n09d88,41377
 umap/static/umap/locale/el.json,sha256=G3O0k62tIsf654xUZO0x988aKIAo0zZCHzRibDxpjo8,41312
-umap/static/umap/locale/en.js,sha256=3zFUHDjehyf1qhY9NcO3SkiTY0cdEinrpIOSez3upRw,30089
-umap/static/umap/locale/en.json,sha256=9EbcClQgnn14besF7LctqoxAWPR4qvnRiMIoN3XeuHY,30024
+umap/static/umap/locale/en.js,sha256=89UHZNqyNhy86A0lPxmFzsw7UYV-f6hHEwnYg4yzQAw,30259
+umap/static/umap/locale/en.json,sha256=U5vQn1-kXUsmAm5tTN2-NbC6UulPa0ERVfs4JQywAwo,30194
 umap/static/umap/locale/en_US.json,sha256=E8ScCCs3lXiHOJPqTNxd7maDyhkkF3GNqN-r2p27lLQ,29813
 umap/static/umap/locale/es.js,sha256=xYnvTBRzycvrYhEA5yr8uFV8aeCoVLPsJegdccDdjQg,32933
 umap/static/umap/locale/es.json,sha256=-JF4DZ5B4yk2Qvhj4FsEhZs0UybS0m0t2roH0cvnPXw,32868
@@ -311,8 +310,8 @@ umap/static/umap/locale/fa_IR.js,sha256=qn-Oc23zaIz_ua3DAvvVljn--jn2fR7eaMF-bsyp
 umap/static/umap/locale/fa_IR.json,sha256=ql1IvgBcDHiAD6ho500PwRE2y8x9gSfsKq96IQgAZTw,38633
 umap/static/umap/locale/fi.js,sha256=wyW-hHzNfKHoPKata6sw_TBx3Grz227eXscuabAGbwQ,30915
 umap/static/umap/locale/fi.json,sha256=lDQ6_RxXtcNI_kahg8XBWlVYUE-MvgUqJA_Ue6DJj3c,30850
-umap/static/umap/locale/fr.js,sha256=qcNce3E8OnRxRQwi8bRm9XhcixmTGtZrdEN-4fjcPSA,32978
-umap/static/umap/locale/fr.json,sha256=RgemOdmvz98TVih78sXjhJ-D69KFE5xk12yr-75cMEo,32913
+umap/static/umap/locale/fr.js,sha256=VLtQz8W6InWu90Ccxx3gJZwuVQ2AutTKImvjdbrNv3U,33146
+umap/static/umap/locale/fr.json,sha256=DzTqe44_JAMHYiNFqGbF3VLHmoXSoavJXcvRegigw-8,33081
 umap/static/umap/locale/gl.js,sha256=ninZHPi3xo8aatt9G6zBNXCX6br0Na7-t20JJT0XDX4,31478
 umap/static/umap/locale/gl.json,sha256=b99nZnWgtOZf1Uj-WUCPnWLrcvg5IGDYCV0wc7ntgb8,31413
 umap/static/umap/locale/he.js,sha256=jljbzL6uctwBN5fzwQM4lFZ6ZLXKzldUeDTyzQTSyqU,33381
@@ -449,6 +448,10 @@ umap/static/umap/vendors/tokml/tokml.es.js,sha256=BqL0WqFH5UZAh_S_265E6PWZjPMYxe
 umap/static/umap/vendors/tokml/tokml.es.mjs.map,sha256=vw5JxZFh_2_xM1cHI51r1Bf48JaBKzNcR7ddgaaF8KY,45844
 umap/static/umap/vendors/toolbar/leaflet.toolbar.css,sha256=5KVBOQ0ivsFuafKYvVm32wJ_fi7w8Li1-2Rwwcv85jA,2244
 umap/static/umap/vendors/toolbar/leaflet.toolbar.js,sha256=HXh_bR49ZFpJ-GNXDNo2eHy-fJmrWehAzUeHgGhu__c,5326
+umap/storage/__init__.py,sha256=Aj421eIsZhsu0B7zd5lTJufVYr0EtUkH0lTqpbBh8AU,85
+umap/storage/fs.py,sha256=CdjnDe4UVMt_9Yp2uZqvtarfHTAYRed6Tid2UU-sBgY,3721
+umap/storage/s3.py,sha256=KAYu3vAqXbd5UhaoPxG6zcGtBfKZOzzi-6uY6YEuIcY,1962
+umap/storage/staticfiles.py,sha256=mxFcenC1JECmpNy4H0e7vX8GObDZVXzs1RPjQFWNd5k,2473
 umap/templates/404.html,sha256=1yLlD8rSF_9cfjm5FYy--P46HLVbHeFkJiW9nRzM--E,399
 umap/templates/500.html,sha256=Z8x47OVfYXquAYAlmRB0EJVTCiCaBppFFiFEmoYsMYY,5202
 umap/templates/base.html,sha256=_Q0Ikwese3vlUl0pKQdzHDy_oRT9OV4uWh0RGFaYAQA,1499
@@ -495,14 +498,14 @@ umap/tests/conftest.py,sha256=KQCZanCTl1ABLIKOuyxS_cpBoXGiwjDc29jsLBiSWxY,1633
 umap/tests/settings.py,sha256=tY70LMFXyo_WijswqGyeWai7vBzM62k7IA8pkkbc9y4,816
 umap/tests/test_clean_tilelayer.py,sha256=wGTd_AHOTmQ4QMswAyc-1_lJmQOSyhY3OahLAusEIdA,2515
 umap/tests/test_datalayer.py,sha256=NWX7o-sLOrq3nHT0GDywz5vtJU4HJhZZh11r_rWxhVA,9539
-umap/tests/test_datalayer_s3.py,sha256=bqLpdQZLoL-jwD7HeqMXuLFUfnkP-xd6B6BBW7JFm0U,4145
+umap/tests/test_datalayer_s3.py,sha256=6V3AK22AXkFNjx5__SyBk0Uj0rTDAjJQv67r7D_MDVc,4155
 umap/tests/test_datalayer_views.py,sha256=Fx_oQF3hBC2FVHTTjTScXbFS2d7FRKdBL7QFFexvKkg,22880
 umap/tests/test_empty_trash.py,sha256=9dYdnQqzlfgkExQxiQDqQ4flKsPTZ97uB3te5wmZ0Nw,1112
 umap/tests/test_licence.py,sha256=BxNY3gdKhIoc2u5OPmAkmjCp0jJN-Jm-uPOfAZlpOHA,339
 umap/tests/test_map.py,sha256=vrtheSMQNk45kBIcJ0QY9K7HKYee5yg4Vnp78DyaIwQ,5170
 umap/tests/test_map_views.py,sha256=EKLJnQ-xk_bkaJ6P7OJ2bnya5orbaSnWFV8GIYcjDNk,33823
 umap/tests/test_merge_features.py,sha256=uLZSW00WAI8_nZS0KPP8gg8U4nnky-XGb-VhhKUxv1M,2275
-umap/tests/test_statics.py,sha256=WJe4DZ-cSfN_wCRD8U9ocl6v5FoXrVwBjU6kI6BOcmY,1252
+umap/tests/test_statics.py,sha256=xKuxT8Xj5Ii7gKISuiSfDj7dpjmJ2Ierby3Lg-haZCg,1264
 umap/tests/test_team_views.py,sha256=vExhJ3c1cJ7vgxe0G20UzTKkzR5D2UgAapk09muUg5w,4481
 umap/tests/test_tilelayer.py,sha256=toVpVutEvMLWKx5uH7ZbGNPGzqICZx1_S2OOpIfYPfQ,603
 umap/tests/test_utils.py,sha256=noh-AFL3qV-dNZYr8L1acsYC02SI710Bq2ZXV-jBEzk,407
@@ -569,8 +572,8 @@ umap/tests/integration/test_view_marker.py,sha256=ZLS6-GOWYpjeoYGHiHa7HesXJTLu9w
 umap/tests/integration/test_view_polygon.py,sha256=NMJC6Nt9VpQ8FIU9Pqq2OspHv49xsWlsoXCr8iBa0VA,2060
 umap/tests/integration/test_view_polyline.py,sha256=aJoXKmLhJaN0yhPdDCVskZNGx3q3mLDkjVPhZ30cadA,13959
 umap/tests/integration/test_websocket_sync.py,sha256=Xjn8z7Gj2PAmPmLkMTsHztFmhzsfyE3vg-wfewpA2I4,15511
-umap_project-2.8.0a0.dist-info/METADATA,sha256=a0AHRG8dpF_7KYUQNFAGMe84KPD56yidRdzGIilsJCU,2993
-umap_project-2.8.0a0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-umap_project-2.8.0a0.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
-umap_project-2.8.0a0.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
-umap_project-2.8.0a0.dist-info/RECORD,,
+umap_project-2.8.0a2.dist-info/METADATA,sha256=Z8IXnRgLp4AOUzTAkfRUB5hatnauca2C0V7NrLZieHk,2993
+umap_project-2.8.0a2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+umap_project-2.8.0a2.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-2.8.0a2.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-2.8.0a2.dist-info/RECORD,,

umap/storage.py

@@ -1,216 +0,0 @@
-import operator
-import os
-import shutil
-import time
-from gzip import GzipFile
-from pathlib import Path
-
-from botocore.exceptions import ClientError
-from django.conf import settings
-from django.contrib.staticfiles.storage import ManifestStaticFilesStorage
-from django.core.files.storage import FileSystemStorage
-from rcssmin import cssmin
-from rjsmin import jsmin
-from storages.backends.s3 import S3Storage
-
-
-class UmapManifestStaticFilesStorage(ManifestStaticFilesStorage):
-    support_js_module_import_aggregation = True
-    max_post_process_passes = 15
-
-    # We remove `;` at the end of all regexps to match our biome config.
-    _js_module_import_aggregation_patterns = (
-        "*.js",
-        (
-            (
-                (
-                    r"""(?P<matched>import(?s:(?P<import>[\s\{].*?))"""
-                    r"""\s*from\s*['"](?P<url>[\.\/].*?)["']\s*)"""
-                ),
-                'import%(import)s from "%(url)s"\n',
-            ),
-            (
-                (
-                    r"""(?P<matched>export(?s:(?P<exports>[\s\{].*?))"""
-                    r"""\s*from\s*["'](?P<url>[\.\/].*?)["']\s*)"""
-                ),
-                'export%(exports)s from "%(url)s"\n',
-            ),
-            (
-                r"""(?P<matched>import\s*['"](?P<url>[\.\/].*?)["']\s*)""",
-                'import"%(url)s"\n',
-            ),
-            (
-                r"""(?P<matched>import\(["'](?P<url>.*?)["']\)\.then)""",
-                """import("%(url)s").then""",
-            ),
-            (
-                r"""(?P<matched>await import\(["'](?P<url>.*?)["']\))""",
-                """await import("%(url)s")""",
-            ),
-        ),
-    )
-
-    def post_process(self, paths, **options):
-        collected = super().post_process(paths, **options)
-        for original_path, processed_path, processed in collected:
-            if isinstance(processed, Exception):
-                print("Error with file", original_path)
-                raise processed
-            if processed_path.endswith(".js"):
-                path = Path(settings.STATIC_ROOT) / processed_path
-                initial = path.read_text()
-                if "sourceMappingURL" not in initial:  # Already minified.
-                    minified = jsmin(initial)
-                    path.write_text(minified)
-            if processed_path.endswith(".css"):
-                path = Path(settings.STATIC_ROOT) / processed_path
-                initial = path.read_text()
-                if "sourceMappingURL" not in initial:  # Already minified.
-                    minified = cssmin(initial)
-                    path.write_text(minified)
-            yield original_path, processed_path, True
-
-
-class UmapS3(S3Storage):
-    gzip = True
-
-    def get_reference_version(self, instance):
-        metadata = self.connection.meta.client.head_object(
-            Bucket=self.bucket_name, Key=instance.geojson.name
-        )
-        # Do not fail if bucket does not handle versioning
-        return metadata.get("VersionId", metadata["ETag"])
-
-    def make_filename(self, instance):
-        return f"{str(instance.pk)}.geojson"
-
-    def list_versions(self, instance):
-        response = self.connection.meta.client.list_object_versions(
-            Bucket=self.bucket_name, Prefix=instance.geojson.name
-        )
-        return [
-            {
-                "ref": version["VersionId"],
-                "at": version["LastModified"].timestamp() * 1000,
-                "size": version["Size"],
-            }
-            for version in response["Versions"]
-        ]
-
-    def get_version(self, ref, instance):
-        try:
-            data = self.connection.meta.client.get_object(
-                Bucket=self.bucket_name,
-                Key=instance.geojson.name,
-                VersionId=ref,
-            )
-        except ClientError:
-            raise ValueError(f"Invalid version reference: {ref}")
-        return GzipFile(mode="r", fileobj=data["Body"]).read()
-
-    def get_version_path(self, ref, instance):
-        return self.url(instance.geojson.name, parameters={"VersionId": ref})
-
-    def onDatalayerSave(self, instance):
-        pass
-
-    def onDatalayerDelete(self, instance):
-        return self.connection.meta.client.delete_object(
-            Bucket=self.bucket_name,
-            Key=instance.geojson.name,
-        )
-
-
-class UmapFileSystem(FileSystemStorage):
-    def get_reference_version(self, instance):
-        return self._extract_version_ref(instance.geojson.name)
-
-    def make_filename(self, instance):
-        root = self._base_path(instance)
-        name = "%s_%s.geojson" % (instance.pk, int(time.time() * 1000))
-        return root / name
-
-    def list_versions(self, instance):
-        root = self._base_path(instance)
-        names = self.listdir(root)[1]
-        names = [name for name in names if self._is_valid_version(name, instance)]
-        versions = [self._version_metadata(name, instance) for name in names]
-        versions.sort(reverse=True, key=operator.itemgetter("at"))
-        return versions
-
-    def get_version(self, ref, instance):
-        with self.open(self.get_version_path(ref, instance), "r") as f:
-            return f.read()
-
-    def get_version_path(self, ref, instance):
-        base_path = Path(settings.MEDIA_ROOT) / self._base_path(instance)
-        fullpath = base_path / f"{instance.pk}_{ref}.geojson"
-        if instance.old_id and not fullpath.exists():
-            fullpath = base_path / f"{instance.old_id}_{ref}.geojson"
-        if not fullpath.exists():
-            raise ValueError(f"Invalid version reference: {ref}")
-        return fullpath
-
-    def onDatalayerSave(self, instance):
-        self._purge_gzip(instance)
-        self._purge_old_versions(instance, keep=settings.UMAP_KEEP_VERSIONS)
-
-    def onDatalayerDelete(self, instance):
-        self._purge_gzip(instance)
-        self._purge_old_versions(instance, keep=None)
-
-    def _extract_version_ref(self, path):
-        version = path.split(".")[0]
-        if "_" in version:
-            return version.split("_")[-1]
-        return version
-
-    def _base_path(self, instance):
-        path = ["datalayer", str(instance.map.pk)[-1]]
-        if len(str(instance.map.pk)) > 1:
-            path.append(str(instance.map.pk)[-2])
-        path.append(str(instance.map.pk))
-        return Path(os.path.join(*path))
-
-    def _is_valid_version(self, name, instance):
-        valid_prefixes = [name.startswith("%s_" % instance.pk)]
-        if instance.old_id:
-            valid_prefixes.append(name.startswith("%s_" % instance.old_id))
-        return any(valid_prefixes) and name.endswith(".geojson")
-
-    def _version_metadata(self, name, instance):
-        ref = self._extract_version_ref(name)
-        return {
-            "name": name,
-            "ref": ref,
-            "at": ref,
-            "size": self.size(self._base_path(instance) / name),
-        }
-
-    def _purge_old_versions(self, instance, keep=None):
-        root = self._base_path(instance)
-        versions = self.list_versions(instance)
-        if keep is not None:
-            versions = versions[keep:]
-        for version in versions:
-            name = version["name"]
-            # Should not be in the list, but ensure to not delete the file
-            # currently used in database
-            if keep is not None and instance.geojson.name.endswith(name):
-                continue
-            try:
-                self.delete(root / name)
-            except FileNotFoundError:
-                pass
-
-    def _purge_gzip(self, instance):
-        root = self._base_path(instance)
-        names = self.listdir(root)[1]
-        prefixes = [f"{instance.pk}_"]
-        if instance.old_id:
-            prefixes.append(f"{instance.old_id}_")
-        prefixes = tuple(prefixes)
-        for name in names:
-            if name.startswith(prefixes) and name.endswith(".gz"):
-                self.delete(root / name)