From ea24bf5f705b89986b434d4919eee306d7631371 Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Fri, 12 May 2023 12:14:09 -0700
Subject: [PATCH 01/44] updates jquery to track minor/patch versions #9527

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 68d8c5d39de..1fa0ca4d9d2 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
         "font-awesome": "~4.6.3",
         "ionicons": "~2.0.1",
         "jqtree": "1.3.4",
-        "jquery": "3.6.1",
+        "jquery": "^3.6.1",
         "jquery-migrate": "3.4.0",
         "jquery-validation": "1.19.5",
         "jqueryui": "1.11.1",

From f1c6d60d0da48090179c63340b9ac9e14132cc91 Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Mon, 19 Jun 2023 14:01:26 -0700
Subject: [PATCH 02/44] Simplify value check, re #9648

---
 arches/app/models/tile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/models/tile.py b/arches/app/models/tile.py
index a9b25872faf..314b15a1b31 100644
--- a/arches/app/models/tile.py
+++ b/arches/app/models/tile.py
@@ -566,7 +566,7 @@ def after_update_all(self):
 
     def is_blank(self):
         if self.data != {}:
-            if len([item for item in list(self.data.values()) if item is not None]) > 0:
+            if any(self.data.values()):
                 return False
 
         child_tiles_are_blank = True

From bc5551c485dedd75b8e64fc8e8e413286bd2cb97 Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Mon, 19 Jun 2023 14:02:01 -0700
Subject: [PATCH 03/44] Add check for prov tiles to model, re #9648

---
 arches/app/models/models.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arches/app/models/models.py b/arches/app/models/models.py
index ca0ec38132f..0f31c9334da 100644
--- a/arches/app/models/models.py
+++ b/arches/app/models/models.py
@@ -1100,8 +1100,12 @@ def __init__(self, *args, **kwargs):
         if not self.tileid:
             self.tileid = uuid.uuid4()
 
+    def is_fully_provisional(self):
+        has_data = any(self.data.values())
+        self.provisionaledits is not None and has_data is False
+
     def save(self, *args, **kwargs):
-        if self.sortorder is None or (self.provisionaledits is not None and self.data == {}):
+        if self.sortorder is None or self.is_fully_provisional():
             sortorder_max = TileModel.objects.filter(
                 nodegroup_id=self.nodegroup_id, resourceinstance_id=self.resourceinstance_id
             ).aggregate(Max("sortorder"))["sortorder__max"]

From b27a04d2a8eebe9f6a968303008c9c81afbd14bb Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Thu, 29 Jun 2023 13:53:03 -0700
Subject: [PATCH 04/44] creates empty key/value pairs for all nodes in a tile
 #9648

---
 arches/app/models/models.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arches/app/models/models.py b/arches/app/models/models.py
index 0f31c9334da..c216a5630b4 100644
--- a/arches/app/models/models.py
+++ b/arches/app/models/models.py
@@ -1101,10 +1101,13 @@ def __init__(self, *args, **kwargs):
             self.tileid = uuid.uuid4()
 
     def is_fully_provisional(self):
-        has_data = any(self.data.values())
-        self.provisionaledits is not None and has_data is False
+        return bool(self.provisionaledits and not any(self.data.values()))
 
     def save(self, *args, **kwargs):
+        for node in Node.objects.filter(nodegroup_id=self.nodegroup_id):
+            if not str(node.pk) in self.data:
+                self.data[str(node.pk)] = None
+
         if self.sortorder is None or self.is_fully_provisional():
             sortorder_max = TileModel.objects.filter(
                 nodegroup_id=self.nodegroup_id, resourceinstance_id=self.resourceinstance_id

From 46f67548f2beeb17900b7acc68c902403d7661d2 Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Thu, 29 Jun 2023 14:06:29 -0700
Subject: [PATCH 05/44] adds migration for tiledata #9648

---
 ...9648_add_empty_key_value_pairs_to_tiles.py | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py

diff --git a/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py b/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py
new file mode 100644
index 00000000000..3dbaf350ab3
--- /dev/null
+++ b/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py
@@ -0,0 +1,20 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("models", "9477_fix_for_spatial_view_dbf_function_edtf_displaying_null"),
+    ]
+
+    def forwards_func(apps, schema_editor):
+        TileModel = apps.get_model("models", "TileModel")
+
+        for tile in TileModel.objects.all():
+            tile.save()
+
+    def reverse_func(apps, schema_editor):
+        pass
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func),
+    ]

From 62e0caffd3625e792319592ab26bc9cf2a6bd8bf Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Thu, 29 Jun 2023 14:07:47 -0700
Subject: [PATCH 06/44] nit #9648

---
 .../migrations/9648_add_empty_key_value_pairs_to_tiles.py       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py b/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py
index 3dbaf350ab3..3a7a633b9aa 100644
--- a/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py
+++ b/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py
@@ -10,7 +10,7 @@ def forwards_func(apps, schema_editor):
         TileModel = apps.get_model("models", "TileModel")
 
         for tile in TileModel.objects.all():
-            tile.save()
+            tile.save()  # should trigger new code in `TileModel.save` method that adds empty key/value pairs to tile data
 
     def reverse_func(apps, schema_editor):
         pass

From ad12852d083de652437858dcbc3b2d4d2a50cb1c Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Fri, 30 Jun 2023 11:20:29 -0700
Subject: [PATCH 07/44] updates failing tests #9648" gst

---
 arches/app/models/tile.py             |  3 +-
 tests/importer/jsonld_import_tests.py | 50 +++++++++++++++++++--------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/arches/app/models/tile.py b/arches/app/models/tile.py
index 314b15a1b31..0ee1ec91e6f 100644
--- a/arches/app/models/tile.py
+++ b/arches/app/models/tile.py
@@ -210,9 +210,8 @@ def is_provisional(self):
         been approved by a user in the resource reviewer group
 
         """
-
         result = False
-        if self.provisionaledits is not None and len(self.data) == 0:
+        if self.provisionaledits is not None and not any(self.data.values()):
             result = True
 
         return result
diff --git a/tests/importer/jsonld_import_tests.py b/tests/importer/jsonld_import_tests.py
index 94aaaa7b840..cbb2c2bad92 100644
--- a/tests/importer/jsonld_import_tests.py
+++ b/tests/importer/jsonld_import_tests.py
@@ -1275,14 +1275,26 @@ def get_tile_by_id(tiles, tileid):
         tile1 = get_tiles_by_nodegroup(tiles, "e717dda0-1540-11ea-b353-acde48001122", "f025e108-1540-11ea-b353-acde48001122", 6)
         tile1_parent = get_tile_by_id(tiles, tile1.parenttile_id)
 
-        self.assertEqual(tile1_parent.data, {})
+        self.assertEqual(
+            tile1_parent.data, 
+            {
+                'c5a9174c-1540-11ea-b353-acde48001122': None,
+                'd155a4c0-1540-11ea-b353-acde48001122': None,
+                'ddc44d9c-1540-11ea-b353-acde48001122': None
+            }
+        )
         tile1_grandparent = get_tile_by_id(tiles, tile1_parent.parenttile_id)
         self.assertEqual(tile1_grandparent.data["02ec0ace-1541-11ea-b353-acde48001122"]["en"], {"direction": "ltr", "value": "second part"})
 
         tile2 = get_tiles_by_nodegroup(tiles, "e717dda0-1540-11ea-b353-acde48001122", "f025e108-1540-11ea-b353-acde48001122", 1)
         tile2_parent = get_tile_by_id(tiles, tile2.parenttile_id)
         self.assertEqual(
-            tile2_parent.data, {"d155a4c0-1540-11ea-b353-acde48001122": "2019-12-03", "ddc44d9c-1540-11ea-b353-acde48001122": "2019-12-05"}
+            tile2_parent.data, 
+            {
+                'c5a9174c-1540-11ea-b353-acde48001122': None,
+                "d155a4c0-1540-11ea-b353-acde48001122": "2019-12-03", 
+                "ddc44d9c-1540-11ea-b353-acde48001122": "2019-12-05"
+            }
         )
         tile2_grandparent = get_tile_by_id(tiles, tile2_parent.parenttile_id)
         self.assertEqual(tile2_grandparent.data["02ec0ace-1541-11ea-b353-acde48001122"]["en"], {"direction": "ltr", "value": "asdf"})
@@ -1290,24 +1302,30 @@ def get_tile_by_id(tiles, tileid):
             tile2_grandparent.data["26927e22-1541-11ea-b353-acde48001122"][0]["resourceId"], "5e9baff0-109b-11ea-957a-acde48001122"
         )
         tile2_greatgrandparent = get_tile_by_id(tiles, tile2_grandparent.parenttile_id)
-        self.assertEqual(tile2_greatgrandparent.data, {})
+        self.assertEqual(tile2_greatgrandparent.data, {'af6c5d36-1540-11ea-b353-acde48001122': None})
 
         tile1_greatgrandparent = get_tile_by_id(tiles, tile1_grandparent.parenttile_id)
         self.assertEqual(tile2_greatgrandparent, tile1_greatgrandparent)
 
         tile3 = get_tiles_by_nodegroup(tiles, "c5a9174c-1540-11ea-b353-acde48001122", "d155a4c0-1540-11ea-b353-acde48001122", "2019-12-07")
         self.assertEqual(
-            tile3.data, {"d155a4c0-1540-11ea-b353-acde48001122": "2019-12-07", "ddc44d9c-1540-11ea-b353-acde48001122": "2019-12-08"}
+            tile3.data, 
+            {
+                'c5a9174c-1540-11ea-b353-acde48001122': None,
+                "d155a4c0-1540-11ea-b353-acde48001122": "2019-12-07", 
+                "ddc44d9c-1540-11ea-b353-acde48001122": "2019-12-08"
+            }
         )
         tile3_parent = get_tile_by_id(tiles, tile3.parenttile_id)
         self.assertEqual(tile3_parent.data["02ec0ace-1541-11ea-b353-acde48001122"]["en"], {"direction": "ltr", "value": "bar"})
         tile3_grandparent = get_tile_by_id(tiles, tile3_parent.parenttile_id)
-        self.assertEqual(tile3_grandparent.data, {})
+        self.assertEqual(tile3_grandparent.data, {'af6c5d36-1540-11ea-b353-acde48001122': None})
 
         tile4 = get_tiles_by_nodegroup(tiles, "48f3ab3a-1541-11ea-b353-acde48001122")[0]
         self.assertEqual(
             tile4.data,
             {
+                '48f3ab3a-1541-11ea-b353-acde48001122': None,
                 "54272cd4-1541-11ea-b353-acde48001122": ["d2908ab9-19a6-4a82-953d-5ebe8d164e85"],
                 "8e08a496-1541-11ea-b353-acde48001122": None,
             },
@@ -1472,17 +1490,21 @@ def test_8181_import_bug_2(self):
             actual_tiledata.append(tile.data)
 
         expected_tiledata = [
-            {"f13ffd9c-3e76-11ec-9a49-faffc210b420": {"en": {"value": "ALLAN, DAVID", "direction": "ltr"}}},
             {
-                "f1420740-3e76-11ec-9a49-faffc210b420": None,
-                "f1420f92-3e76-11ec-9a49-faffc210b420": None,
-                "f1417e1a-3e76-11ec-9a49-faffc210b420": ["b83cab06-1cfe-4aeb-9653-cb9f0cc45595"],
-            },
+                'f1403424-3e76-11ec-9a49-faffc210b420': None, 
+                'f1417e1a-3e76-11ec-9a49-faffc210b420': ['b83cab06-1cfe-4aeb-9653-cb9f0cc45595'], 
+                'f1420740-3e76-11ec-9a49-faffc210b420': None, 
+                'f1420f92-3e76-11ec-9a49-faffc210b420': None
+            }, 
             {
-                "f1420740-3e76-11ec-9a49-faffc210b420": None,
-                "f1420f92-3e76-11ec-9a49-faffc210b420": None,
-                "f1417e1a-3e76-11ec-9a49-faffc210b420": ["fc3559c4-03c4-428c-a48e-0f480c8a3751"],
-            },
+                'f1403424-3e76-11ec-9a49-faffc210b420': None, 
+                'f1417e1a-3e76-11ec-9a49-faffc210b420': ['fc3559c4-03c4-428c-a48e-0f480c8a3751'], 
+                'f1420740-3e76-11ec-9a49-faffc210b420': None, 
+                'f1420f92-3e76-11ec-9a49-faffc210b420': None
+            }, 
+            {
+                'f13ffd9c-3e76-11ec-9a49-faffc210b420': {'en': {'value': 'ALLAN, DAVID', 'direction': 'ltr'}}
+            }
         ]
         self.assertCountEqual(actual_tiledata, expected_tiledata)
 

From faa92943a5702aac306fa6c94547ee24ce85f328 Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Fri, 30 Jun 2023 12:38:04 -0700
Subject: [PATCH 08/44] fixes failing tests #9648

---
 .../resource_export_business_data_truth.json  | 402 +++++++++++-------
 tests/importer/jsonld_import_tests.py         |  20 +-
 2 files changed, 252 insertions(+), 170 deletions(-)

diff --git a/tests/fixtures/data/json/resource_export_business_data_truth.json b/tests/fixtures/data/json/resource_export_business_data_truth.json
index 9b6af72f347..cb0214e861a 100644
--- a/tests/fixtures/data/json/resource_export_business_data_truth.json
+++ b/tests/fixtures/data/json/resource_export_business_data_truth.json
@@ -2,287 +2,367 @@
   "business_data": {
     "resources": [
       {
+        "resourceinstance": {
+          "descriptors": {
+            "ar": {
+              "description": "Undefined",
+              "map_popup": "Undefined",
+              "name": "Undefined"
+            },
+            "de": {
+              "description": "Undefined",
+              "map_popup": "Undefined",
+              "name": "Undefined"
+            },
+            "en": {
+              "description": "Undefined",
+              "map_popup": "Undefined",
+              "name": "Prehistoric building, 181-183 High Street"
+            },
+            "en-gb": {
+              "description": "Undefined",
+              "map_popup": "Undefined",
+              "name": "Undefined"
+            },
+            "es": {
+              "description": "Undefined",
+              "map_popup": "Undefined",
+              "name": "Undefined"
+            }
+          },
+          "graph_id": "ab74af76-fa0e-11e6-9e3e-026d961c88e6",
+          "legacyid": "b546621a-9556-4955-8997-8be88dcabf2b",
+          "name": "Prehistoric building, 181-183 High Street",
+          "publication_id": "f546e4de-aa0d-11ec-99a5-8e0f431ffc6d",
+          "resourceinstanceid": "b546621a-9556-4955-8997-8be88dcabf2b"
+        },
         "tiles": [
           {
-            "data": {},
-            "provisionaledits": null,
-            "parenttile_id": null,
+            "data": {
+              "677f236e-09cc-11e7-8ff7-6c4008b05c4c": null
+            },
             "nodegroup_id": "677f236e-09cc-11e7-8ff7-6c4008b05c4c",
-            "sortorder": 0,
+            "parenttile_id": null,
+            "provisionaledits": null,
             "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
+            "sortorder": 0,
             "tileid": "074c5da1-9aad-495a-a5f7-043679f44de6"
           },
           {
             "data": {
-              "677f39a8-09cc-11e7-834a-6c4008b05c4c": "7949d7b5-6e57-469a-8f38-87aac08e1788",
-              "677f303d-09cc-11e7-9aa6-6c4008b05c4c": {"en": {"value": "Prehistoric building, 181-183 High Street", "direction": "ltr"}}
+              "ab74afc8-fa0e-11e6-9e3e-026d961c88e6": {
+                "en": {
+                  "direction": "ltr",
+                  "value": "2"
+                }
+              },
+              "ab74affa-fa0e-11e6-9e3e-026d961c88e6": "7949d7b5-6e57-469a-8f38-87aac08e1788",
+              "ab74b016-fa0e-11e6-9e3e-026d961c88e6": null
             },
+            "nodegroup_id": "ab74afc8-fa0e-11e6-9e3e-026d961c88e6",
+            "parenttile_id": null,
             "provisionaledits": null,
-            "parenttile_id": "074c5da1-9aad-495a-a5f7-043679f44de6",
-            "nodegroup_id": "677f303d-09cc-11e7-9aa6-6c4008b05c4c",
-            "sortorder": 0,
             "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
-            "tileid": "ce97c18b-c8da-4e77-b542-d18dea1a7ab0"
+            "sortorder": 0,
+            "tileid": "18249662-5ad3-4c9c-bcc3-39033bfb2a3e"
           },
           {
             "data": {
-              "677f3c4f-09cc-11e7-92a9-6c4008b05c4c": null,
-              "677f3a97-09cc-11e7-813b-6c4008b05c4c": "1965-02-02",
-              "677f384a-09cc-11e7-868f-6c4008b05c4c": "1964-02-02",
-              "677f1d5e-09cc-11e7-8716-6c4008b05c4c": null,
-              "677f3457-09cc-11e7-aef4-6c4008b05c4c": null,
-              "677f36cf-09cc-11e7-98fd-6c4008b05c4c": "fad6f17d-f7c8-4fa1-b358-e8626571599e",
-              "677f3b75-09cc-11e7-ac1e-6c4008b05c4c": null,
-              "677f3d2b-09cc-11e7-ba91-6c4008b05c4c": null,
-              "677f35b5-09cc-11e7-8978-6c4008b05c4c": "fad6f17d-f7c8-4fa1-b358-e8626571599e"
+              "ab74af95-fa0e-11e6-9e3e-026d961c88e6": null,
+              "ab74afe2-fa0e-11e6-9e3e-026d961c88e6": null,
+              "ab74affd-fa0e-11e6-9e3e-026d961c88e6": "9fa56006-6828-480f-8395-ad5c5a84726b"
             },
+            "nodegroup_id": "ab74af95-fa0e-11e6-9e3e-026d961c88e6",
+            "parenttile_id": null,
             "provisionaledits": null,
-            "parenttile_id": "074c5da1-9aad-495a-a5f7-043679f44de6",
-            "nodegroup_id": "677f1d5e-09cc-11e7-8716-6c4008b05c4c",
-            "sortorder": 0,
             "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
-            "tileid": "8f0f6d90-a132-47cb-bd51-b2e644bd127c"
-          },
-          {
-            "data": {},
-            "provisionaledits": null,
-            "parenttile_id": null,
-            "nodegroup_id": "e456023d-fa36-11e6-9e3e-026d961c88e6",
             "sortorder": 0,
-            "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
-            "tileid": "fcc6272f-06fd-49ad-869b-ae0ea284a0cb"
+            "tileid": "229e13a5-becc-4a01-9e41-4bc6777e3751"
           },
           {
             "data": {
-              "e456024f-fa36-11e6-9e3e-026d961c88e6": null,
-              "e4560243-fa36-11e6-9e3e-026d961c88e6": null,
-              "e4560245-fa36-11e6-9e3e-026d961c88e6": null,
-              "e4560246-fa36-11e6-9e3e-026d961c88e6": "9fa56006-6828-480f-8395-ad5c5a84726b",
-              "e4560237-fa36-11e6-9e3e-026d961c88e6": null,
-              "e4560249-fa36-11e6-9e3e-026d961c88e6": null
+              "6ead3ef0-09cc-11e7-a37d-6c4008b05c4c": null
             },
+            "nodegroup_id": "6ead3ef0-09cc-11e7-a37d-6c4008b05c4c",
+            "parenttile_id": null,
             "provisionaledits": null,
-            "parenttile_id": "fcc6272f-06fd-49ad-869b-ae0ea284a0cb",
-            "nodegroup_id": "e4560237-fa36-11e6-9e3e-026d961c88e6",
-            "sortorder": 0,
             "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
-            "tileid": "e0085315-dd30-4f6c-ace8-d4f78f4ebb99"
-          },
-          {
-            "data": {},
-            "provisionaledits": null,
-            "parenttile_id": null,
-            "nodegroup_id": "6ead3ef0-09cc-11e7-a37d-6c4008b05c4c",
             "sortorder": 0,
-            "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
             "tileid": "726ccc5b-38de-4a05-b565-2192cea8fd12"
           },
           {
             "data": {
               "6ead34dc-09cc-11e7-be0d-6c4008b05c4c": {
-                "type": "FeatureCollection",
                 "features": [
                   {
                     "geometry": {
-                      "type": "Point",
                       "coordinates": [
                         -0.542000315593716,
                         53.2268402605504
-                      ]
+                      ],
+                      "type": "Point"
                     },
-                    "type": "Feature",
                     "id": "16432b04-dc6b-4c09-94a6-6017cefd21e1",
-                    "properties": {}
+                    "properties": {},
+                    "type": "Feature"
                   }
-                ]
+                ],
+                "type": "FeatureCollection"
               }
             },
-            "provisionaledits": null,
-            "parenttile_id": "726ccc5b-38de-4a05-b565-2192cea8fd12",
             "nodegroup_id": "6ead34dc-09cc-11e7-be0d-6c4008b05c4c",
-            "sortorder": 0,
+            "parenttile_id": "726ccc5b-38de-4a05-b565-2192cea8fd12",
+            "provisionaledits": null,
             "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
+            "sortorder": 0,
             "tileid": "73914b7b-41fb-4543-a777-47b4cba852e3"
           },
           {
             "data": {
-              "ab74af95-fa0e-11e6-9e3e-026d961c88e6": null,
-              "ab74afe2-fa0e-11e6-9e3e-026d961c88e6": null,
-              "ab74affd-fa0e-11e6-9e3e-026d961c88e6": "9fa56006-6828-480f-8395-ad5c5a84726b"
+              "677f1d5e-09cc-11e7-8716-6c4008b05c4c": null,
+              "677f3457-09cc-11e7-aef4-6c4008b05c4c": null,
+              "677f35b5-09cc-11e7-8978-6c4008b05c4c": "fad6f17d-f7c8-4fa1-b358-e8626571599e",
+              "677f36cf-09cc-11e7-98fd-6c4008b05c4c": "fad6f17d-f7c8-4fa1-b358-e8626571599e",
+              "677f384a-09cc-11e7-868f-6c4008b05c4c": "1964-02-02",
+              "677f3a97-09cc-11e7-813b-6c4008b05c4c": "1965-02-02",
+              "677f3b75-09cc-11e7-ac1e-6c4008b05c4c": null,
+              "677f3c4f-09cc-11e7-92a9-6c4008b05c4c": null,
+              "677f3d2b-09cc-11e7-ba91-6c4008b05c4c": null
             },
+            "nodegroup_id": "677f1d5e-09cc-11e7-8716-6c4008b05c4c",
+            "parenttile_id": "074c5da1-9aad-495a-a5f7-043679f44de6",
             "provisionaledits": null,
-            "parenttile_id": null,
-            "nodegroup_id": "ab74af95-fa0e-11e6-9e3e-026d961c88e6",
-            "sortorder": 0,
             "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
-            "tileid": "229e13a5-becc-4a01-9e41-4bc6777e3751"
+            "sortorder": 0,
+            "tileid": "8f0f6d90-a132-47cb-bd51-b2e644bd127c"
           },
           {
             "data": {
-              "ab74affa-fa0e-11e6-9e3e-026d961c88e6": "7949d7b5-6e57-469a-8f38-87aac08e1788",
-              "ab74afc8-fa0e-11e6-9e3e-026d961c88e6": {"en": {"value": "2", "direction": "ltr"}},
-              "ab74b016-fa0e-11e6-9e3e-026d961c88e6": null
+              "677f303d-09cc-11e7-9aa6-6c4008b05c4c": {
+                "en": {
+                  "direction": "ltr",
+                  "value": "Prehistoric building, 181-183 High Street"
+                }
+              },
+              "677f39a8-09cc-11e7-834a-6c4008b05c4c": "7949d7b5-6e57-469a-8f38-87aac08e1788"
             },
+            "nodegroup_id": "677f303d-09cc-11e7-9aa6-6c4008b05c4c",
+            "parenttile_id": "074c5da1-9aad-495a-a5f7-043679f44de6",
             "provisionaledits": null,
-            "parenttile_id": null,
-            "nodegroup_id": "ab74afc8-fa0e-11e6-9e3e-026d961c88e6",
-            "sortorder": 0,
             "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
-            "tileid": "18249662-5ad3-4c9c-bcc3-39033bfb2a3e"
-          }
-        ],
-        "resourceinstance": {
-          "descriptors":  {
-            "ar": {"description": "Undefined", "map_popup": "Undefined", "name": "Undefined"}, "de": {"description": "Undefined", "map_popup": "Undefined", "name": "Undefined"}, "en": {"description": "Undefined", "map_popup": "Undefined", "name": "Prehistoric building, 181-183 High Street"}, "en-gb": {"description": "Undefined", "map_popup": "Undefined", "name": "Undefined"}, "es": {"description": "Undefined", "map_popup": "Undefined", "name": "Undefined"}
-          },
-          "publication_id": "f546e4de-aa0d-11ec-99a5-8e0f431ffc6d",
-          "graph_id": "ab74af76-fa0e-11e6-9e3e-026d961c88e6",
-          "resourceinstanceid": "b546621a-9556-4955-8997-8be88dcabf2b",
-          "legacyid": "b546621a-9556-4955-8997-8be88dcabf2b",
-          "name": "Prehistoric building, 181-183 High Street"
-        }
-      },
-      {
-        "tiles": [
-          {
-            "data": {},
-            "provisionaledits": null,
-            "parenttile_id": null,
-            "nodegroup_id": "677f236e-09cc-11e7-8ff7-6c4008b05c4c",
             "sortorder": 0,
-            "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
-            "tileid": "691178e1-1588-49f6-9dea-c4b69d04d3f7"
+            "tileid": "ce97c18b-c8da-4e77-b542-d18dea1a7ab0"
           },
           {
             "data": {
-              "677f39a8-09cc-11e7-834a-6c4008b05c4c": "9fa56006-6828-480f-8395-ad5c5a84726b",
-              "677f303d-09cc-11e7-9aa6-6c4008b05c4c":  {"en": {"value": "Prehistoric building, 181-183 High Street", "direction": "ltr"}}
+              "e4560237-fa36-11e6-9e3e-026d961c88e6": null,
+              "e4560243-fa36-11e6-9e3e-026d961c88e6": null,
+              "e4560245-fa36-11e6-9e3e-026d961c88e6": null,
+              "e4560246-fa36-11e6-9e3e-026d961c88e6": "9fa56006-6828-480f-8395-ad5c5a84726b",
+              "e4560249-fa36-11e6-9e3e-026d961c88e6": null,
+              "e456024f-fa36-11e6-9e3e-026d961c88e6": null
             },
+            "nodegroup_id": "e4560237-fa36-11e6-9e3e-026d961c88e6",
+            "parenttile_id": "fcc6272f-06fd-49ad-869b-ae0ea284a0cb",
             "provisionaledits": null,
-            "parenttile_id": "691178e1-1588-49f6-9dea-c4b69d04d3f7",
-            "nodegroup_id": "677f303d-09cc-11e7-9aa6-6c4008b05c4c",
+            "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
             "sortorder": 0,
-            "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
-            "tileid": "e9343014-d4f7-4dc7-82ab-5b3301d1953e"
+            "tileid": "e0085315-dd30-4f6c-ace8-d4f78f4ebb99"
           },
           {
             "data": {
-              "677f3c4f-09cc-11e7-92a9-6c4008b05c4c": null,
-              "677f3a97-09cc-11e7-813b-6c4008b05c4c": "2018-01-01",
-              "677f384a-09cc-11e7-868f-6c4008b05c4c": "2017-01-01",
-              "677f1d5e-09cc-11e7-8716-6c4008b05c4c": null,
-              "677f3457-09cc-11e7-aef4-6c4008b05c4c": null,
-              "677f36cf-09cc-11e7-98fd-6c4008b05c4c": "7949d7b5-6e57-469a-8f38-87aac08e1788",
-              "677f3b75-09cc-11e7-ac1e-6c4008b05c4c": null,
-              "677f3d2b-09cc-11e7-ba91-6c4008b05c4c": null,
-              "677f35b5-09cc-11e7-8978-6c4008b05c4c": "7949d7b5-6e57-469a-8f38-87aac08e1788"
+              "e456023d-fa36-11e6-9e3e-026d961c88e6": null
             },
+            "nodegroup_id": "e456023d-fa36-11e6-9e3e-026d961c88e6",
+            "parenttile_id": null,
             "provisionaledits": null,
-            "parenttile_id": "691178e1-1588-49f6-9dea-c4b69d04d3f7",
-            "nodegroup_id": "677f1d5e-09cc-11e7-8716-6c4008b05c4c",
+            "resourceinstance_id": "b546621a-9556-4955-8997-8be88dcabf2b",
             "sortorder": 0,
-            "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
-            "tileid": "97b14ee9-db22-47fe-abc1-a47c970de721"
+            "tileid": "fcc6272f-06fd-49ad-869b-ae0ea284a0cb"
+          }
+        ]
+      },
+      {
+        "resourceinstance": {
+          "descriptors": {
+            "ar": {
+              "description": "Undefined",
+              "map_popup": "Undefined",
+              "name": "Undefined"
+            },
+            "de": {
+              "description": "Undefined",
+              "map_popup": "Undefined",
+              "name": "Undefined"
+            },
+            "en": {
+              "description": "Undefined",
+              "map_popup": "Undefined",
+              "name": "Prehistoric building, 181-183 High Street"
+            },
+            "en-gb": {
+              "description": "Undefined",
+              "map_popup": "Undefined",
+              "name": "Undefined"
+            },
+            "es": {
+              "description": "Undefined",
+              "map_popup": "Undefined",
+              "name": "Undefined"
+            }
           },
+          "graph_id": "ab74af76-fa0e-11e6-9e3e-026d961c88e6",
+          "legacyid": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
+          "name": "Prehistoric building, 181-183 High Street",
+          "publication_id": "f546e4de-aa0d-11ec-99a5-8e0f431ffc6d",
+          "resourceinstanceid": "75226cdb-6ecb-4dab-8f83-3537fa298ca3"
+        },
+        "tiles": [
           {
-            "data": {},
-            "provisionaledits": null,
+            "data": {
+              "6ead3ef0-09cc-11e7-a37d-6c4008b05c4c": null
+            },
+            "nodegroup_id": "6ead3ef0-09cc-11e7-a37d-6c4008b05c4c",
             "parenttile_id": null,
-            "nodegroup_id": "e456023d-fa36-11e6-9e3e-026d961c88e6",
-            "sortorder": 0,
+            "provisionaledits": null,
             "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
-            "tileid": "a30e1f76-0468-4004-9a9e-7d77fb5b0c72"
+            "sortorder": 0,
+            "tileid": "007e78ea-b2e4-45e8-ac15-ac756fb106e4"
           },
           {
             "data": {
-              "e456024f-fa36-11e6-9e3e-026d961c88e6": null,
+              "e4560237-fa36-11e6-9e3e-026d961c88e6": null,
               "e4560243-fa36-11e6-9e3e-026d961c88e6": null,
               "e4560245-fa36-11e6-9e3e-026d961c88e6": null,
               "e4560246-fa36-11e6-9e3e-026d961c88e6": "fad6f17d-f7c8-4fa1-b358-e8626571599e",
-              "e4560237-fa36-11e6-9e3e-026d961c88e6": null,
-              "e4560249-fa36-11e6-9e3e-026d961c88e6": null
+              "e4560249-fa36-11e6-9e3e-026d961c88e6": null,
+              "e456024f-fa36-11e6-9e3e-026d961c88e6": null
             },
-            "provisionaledits": null,
-            "parenttile_id": "a30e1f76-0468-4004-9a9e-7d77fb5b0c72",
             "nodegroup_id": "e4560237-fa36-11e6-9e3e-026d961c88e6",
-            "sortorder": 0,
-            "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
-            "tileid": "04fa42e8-d491-4182-8b60-ca5f6ef08e48"
-          },
-          {
-            "data": {},
+            "parenttile_id": "a30e1f76-0468-4004-9a9e-7d77fb5b0c72",
             "provisionaledits": null,
-            "parenttile_id": null,
-            "nodegroup_id": "6ead3ef0-09cc-11e7-a37d-6c4008b05c4c",
-            "sortorder": 0,
             "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
-            "tileid": "007e78ea-b2e4-45e8-ac15-ac756fb106e4"
+            "sortorder": 0,
+            "tileid": "04fa42e8-d491-4182-8b60-ca5f6ef08e48"
           },
           {
             "data": {
               "6ead34dc-09cc-11e7-be0d-6c4008b05c4c": {
-                "type": "FeatureCollection",
                 "features": [
                   {
                     "geometry": {
-                      "type": "Point",
                       "coordinates": [
                         -0.541732301953314,
                         53.2267920320966
-                      ]
+                      ],
+                      "type": "Point"
                     },
-                    "type": "Feature",
                     "id": "b9140d4c-220c-45c3-9800-23c37490c90c",
-                    "properties": {}
+                    "properties": {},
+                    "type": "Feature"
                   }
-                ]
+                ],
+                "type": "FeatureCollection"
               }
             },
-            "provisionaledits": null,
-            "parenttile_id": "007e78ea-b2e4-45e8-ac15-ac756fb106e4",
             "nodegroup_id": "6ead34dc-09cc-11e7-be0d-6c4008b05c4c",
-            "sortorder": 0,
+            "parenttile_id": "007e78ea-b2e4-45e8-ac15-ac756fb106e4",
+            "provisionaledits": null,
             "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
+            "sortorder": 0,
             "tileid": "13147097-bf8a-430c-8b19-0b5c025f7bb0"
           },
+          {
+            "data": {
+              "ab74afc8-fa0e-11e6-9e3e-026d961c88e6": {
+                "en": {
+                  "direction": "ltr",
+                  "value": "1"
+                }
+              },
+              "ab74affa-fa0e-11e6-9e3e-026d961c88e6": "9fa56006-6828-480f-8395-ad5c5a84726b",
+              "ab74b016-fa0e-11e6-9e3e-026d961c88e6": null
+            },
+            "nodegroup_id": "ab74afc8-fa0e-11e6-9e3e-026d961c88e6",
+            "parenttile_id": null,
+            "provisionaledits": null,
+            "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
+            "sortorder": 0,
+            "tileid": "6553453c-d044-4d81-96fa-0a5f37e28812"
+          },
+          {
+            "data": {
+              "677f236e-09cc-11e7-8ff7-6c4008b05c4c": null
+            },
+            "nodegroup_id": "677f236e-09cc-11e7-8ff7-6c4008b05c4c",
+            "parenttile_id": null,
+            "provisionaledits": null,
+            "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
+            "sortorder": 0,
+            "tileid": "691178e1-1588-49f6-9dea-c4b69d04d3f7"
+          },
           {
             "data": {
               "ab74af95-fa0e-11e6-9e3e-026d961c88e6": null,
               "ab74afe2-fa0e-11e6-9e3e-026d961c88e6": null,
               "ab74affd-fa0e-11e6-9e3e-026d961c88e6": "fad6f17d-f7c8-4fa1-b358-e8626571599e"
             },
-            "provisionaledits": null,
-            "parenttile_id": null,
             "nodegroup_id": "ab74af95-fa0e-11e6-9e3e-026d961c88e6",
-            "sortorder": 0,
+            "parenttile_id": null,
+            "provisionaledits": null,
             "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
+            "sortorder": 0,
             "tileid": "7cc77141-2b3c-4118-93a6-51481118f292"
           },
           {
             "data": {
-              "ab74affa-fa0e-11e6-9e3e-026d961c88e6": "9fa56006-6828-480f-8395-ad5c5a84726b",
-              "ab74afc8-fa0e-11e6-9e3e-026d961c88e6": {"en": {"value": "1", "direction": "ltr"}},
-              "ab74b016-fa0e-11e6-9e3e-026d961c88e6": null
+              "677f1d5e-09cc-11e7-8716-6c4008b05c4c": null,
+              "677f3457-09cc-11e7-aef4-6c4008b05c4c": null,
+              "677f35b5-09cc-11e7-8978-6c4008b05c4c": "7949d7b5-6e57-469a-8f38-87aac08e1788",
+              "677f36cf-09cc-11e7-98fd-6c4008b05c4c": "7949d7b5-6e57-469a-8f38-87aac08e1788",
+              "677f384a-09cc-11e7-868f-6c4008b05c4c": "2017-01-01",
+              "677f3a97-09cc-11e7-813b-6c4008b05c4c": "2018-01-01",
+              "677f3b75-09cc-11e7-ac1e-6c4008b05c4c": null,
+              "677f3c4f-09cc-11e7-92a9-6c4008b05c4c": null,
+              "677f3d2b-09cc-11e7-ba91-6c4008b05c4c": null
             },
+            "nodegroup_id": "677f1d5e-09cc-11e7-8716-6c4008b05c4c",
+            "parenttile_id": "691178e1-1588-49f6-9dea-c4b69d04d3f7",
             "provisionaledits": null,
+            "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
+            "sortorder": 0,
+            "tileid": "97b14ee9-db22-47fe-abc1-a47c970de721"
+          },
+          {
+            "data": {
+              "e456023d-fa36-11e6-9e3e-026d961c88e6": null
+            },
+            "nodegroup_id": "e456023d-fa36-11e6-9e3e-026d961c88e6",
             "parenttile_id": null,
-            "nodegroup_id": "ab74afc8-fa0e-11e6-9e3e-026d961c88e6",
+            "provisionaledits": null,
+            "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
             "sortorder": 0,
+            "tileid": "a30e1f76-0468-4004-9a9e-7d77fb5b0c72"
+          },
+          {
+            "data": {
+              "677f303d-09cc-11e7-9aa6-6c4008b05c4c": {
+                "en": {
+                  "direction": "ltr",
+                  "value": "Prehistoric building, 181-183 High Street"
+                }
+              },
+              "677f39a8-09cc-11e7-834a-6c4008b05c4c": "9fa56006-6828-480f-8395-ad5c5a84726b"
+            },
+            "nodegroup_id": "677f303d-09cc-11e7-9aa6-6c4008b05c4c",
+            "parenttile_id": "691178e1-1588-49f6-9dea-c4b69d04d3f7",
+            "provisionaledits": null,
             "resourceinstance_id": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
-            "tileid": "6553453c-d044-4d81-96fa-0a5f37e28812"
+            "sortorder": 0,
+            "tileid": "e9343014-d4f7-4dc7-82ab-5b3301d1953e"
           }
-        ],
-        "resourceinstance": {
-          "descriptors": {
-            "ar": {"description": "Undefined", "map_popup": "Undefined", "name": "Undefined"}, "de": {"description": "Undefined", "map_popup": "Undefined", "name": "Undefined"}, "en": {"description": "Undefined", "map_popup": "Undefined", "name": "Prehistoric building, 181-183 High Street"}, "en-gb": {"description": "Undefined", "map_popup": "Undefined", "name": "Undefined"}, "es": {"description": "Undefined", "map_popup": "Undefined", "name": "Undefined"}
-          },
-          "name": "Prehistoric building, 181-183 High Street",
-          "publication_id": "f546e4de-aa0d-11ec-99a5-8e0f431ffc6d",
-          "graph_id": "ab74af76-fa0e-11e6-9e3e-026d961c88e6",
-          "resourceinstanceid": "75226cdb-6ecb-4dab-8f83-3537fa298ca3",
-          "legacyid": "75226cdb-6ecb-4dab-8f83-3537fa298ca3"
-        }
+        ]
       }
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/tests/importer/jsonld_import_tests.py b/tests/importer/jsonld_import_tests.py
index cbb2c2bad92..1a9978282fe 100644
--- a/tests/importer/jsonld_import_tests.py
+++ b/tests/importer/jsonld_import_tests.py
@@ -1426,17 +1426,19 @@ def test_8181_import_bug(self):
             actual_tiledata.append(tile.data)
 
         expected_tiledata = [
-            {"f13ffd9c-3e76-11ec-9a49-faffc210b420": {"en": {"value": "ALLAN, DAVID", "direction": "ltr"}}},
+            {'f13ffd9c-3e76-11ec-9a49-faffc210b420': {'en': {'value': 'ALLAN, DAVID', 'direction': 'ltr'}}}, 
             {
-                "f1420740-3e76-11ec-9a49-faffc210b420": None,
-                "f1420f92-3e76-11ec-9a49-faffc210b420": None,
-                "f1417e1a-3e76-11ec-9a49-faffc210b420": ["b83cab06-1cfe-4aeb-9653-cb9f0cc45595"],
-            },
+                'f1403424-3e76-11ec-9a49-faffc210b420': None, 
+                'f1417e1a-3e76-11ec-9a49-faffc210b420': ['b83cab06-1cfe-4aeb-9653-cb9f0cc45595'], 
+                'f1420740-3e76-11ec-9a49-faffc210b420': None, 
+                'f1420f92-3e76-11ec-9a49-faffc210b420': None
+            }, 
             {
-                "f1420740-3e76-11ec-9a49-faffc210b420": None,
-                "f1420f92-3e76-11ec-9a49-faffc210b420": None,
-                "f1417e1a-3e76-11ec-9a49-faffc210b420": ["fc3559c4-03c4-428c-a48e-0f480c8a3751"],
-            },
+                'f1403424-3e76-11ec-9a49-faffc210b420': None, 
+                'f1417e1a-3e76-11ec-9a49-faffc210b420': ['fc3559c4-03c4-428c-a48e-0f480c8a3751'], 
+                'f1420740-3e76-11ec-9a49-faffc210b420': None, 
+                'f1420f92-3e76-11ec-9a49-faffc210b420': None
+            }
         ]
         self.assertCountEqual(actual_tiledata, expected_tiledata)
 

From 89dc9b1c02ab057f54471b478a4527da8b875003 Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Mon, 3 Jul 2023 15:59:33 -0700
Subject: [PATCH 09/44] Update trigger function and add index, #9671

---
 .../9670_improve_bulk_load_performance.py     | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 arches/app/models/migrations/9670_improve_bulk_load_performance.py

diff --git a/arches/app/models/migrations/9670_improve_bulk_load_performance.py b/arches/app/models/migrations/9670_improve_bulk_load_performance.py
new file mode 100644
index 00000000000..6139258088b
--- /dev/null
+++ b/arches/app/models/migrations/9670_improve_bulk_load_performance.py
@@ -0,0 +1,96 @@
+from django.db import migrations
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("models", "8010_export_permissions"),
+    ]
+
+    update_check_excess_tiles_trigger = """
+        create or replace procedure __arches_complete_bulk_load() AS
+        $$
+            DECLARE
+                cardinality_violations bigint;
+            BEGIN
+                alter table tiles enable trigger __arches_check_excess_tiles_trigger;
+                alter table tiles enable trigger __arches_trg_update_spatial_attributes;
+
+                if (not __arches_refresh_spatial_views()) then
+                    Raise EXCEPTION 'Unable to refresh spatial views';
+                end if;
+
+            with cardinality_violations as (SELECT t.resourceinstanceid,
+                                                    t.nodegroupid,
+                                                    COALESCE(t.parenttileid::text, '') parent_tileid,
+                                                    count(*)
+                                            FROM tiles t,
+                                                    node_groups ng
+                                            WHERE t.nodegroupid = ng.nodegroupid
+                                                AND ng.cardinality = '1'
+                                            group by t.resourceinstanceid, t.nodegroupid, parent_tileid
+                                            having count(*) > 1
+                                            LIMIT 1)
+            select count(*)
+            into cardinality_violations
+            from cardinality_violations;
+
+                if (cardinality_violations > 0) then
+                    Raise Exception 'Cardinality violations found. Run `%` to list violations',
+                        'select * from __arches_get_tile_cardinality_violations()';
+                else
+                    Raise Notice 'No cardinality violations found';
+                end if;
+            END
+        $$
+        language plpgsql;
+    """
+
+    restore_check_excess_tiles_trigger = """
+        create or replace procedure __arches_complete_bulk_load() as
+        $$
+        DECLARE
+            cardinality_violations bigint;
+        BEGIN
+            alter table tiles enable trigger __arches_check_excess_tiles_trigger;
+            alter table tiles enable trigger __arches_trg_update_spatial_attributes;
+
+            if (not __arches_refresh_spatial_views()) then
+                Raise EXCEPTION 'Unable to refresh spatial views';
+            end if;
+
+        with cardinality_violations as (SELECT t.resourceinstanceid,
+                                                t.nodegroupid,
+                                                COALESCE(t.parenttileid::text, '') parent_tileid,
+                                                count(*)
+                                        FROM tiles t,
+                                                node_groups ng
+                                        WHERE t.nodegroupid = ng.nodegroupid
+                                            AND ng.cardinality = '1'
+                                        group by t.resourceinstanceid, t.nodegroupid, parent_tileid
+                                        having count(*) > 1)
+        select count(*)
+        into cardinality_violations
+        from cardinality_violations;
+
+            if (cardinality_violations > 0) then
+                Raise Exception 'Cardinality violations found. Run `%` to list violations',
+                    'select * from __arches_get_tile_cardinality_violations()';
+            else
+                Raise Notice 'No cardinality violations found';
+            end if;
+        END $$
+        language plpgsql;
+    """
+
+    create_tileid_index_on_load_staging = """
+        CREATE INDEX IF NOT EXISTS load_staging_tileid ON load_staging;
+    """
+
+    drop_tileid_index_on_load_staging = """
+        DROP INDEX IF EXISTS load_staging_tileid;
+    """
+
+    operations = [
+        migrations.RunSQL(update_check_excess_tiles_trigger, restore_check_excess_tiles_trigger),
+        migrations.RunSQL(create_tileid_index_on_load_staging, drop_tileid_index_on_load_staging),
+    ]

From ceaea6c23cc21ce20028297561db31f5675c26e0 Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Mon, 3 Jul 2023 16:02:40 -0700
Subject: [PATCH 10/44] Skip check cardinality for editor, #9669

---
 arches/app/etl_modules/base_data_editor.py   |  2 +-
 arches/app/etl_modules/base_import_module.py | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/arches/app/etl_modules/base_data_editor.py b/arches/app/etl_modules/base_data_editor.py
index 7aa8b118575..8389bd68436 100644
--- a/arches/app/etl_modules/base_data_editor.py
+++ b/arches/app/etl_modules/base_data_editor.py
@@ -367,7 +367,7 @@ def run_load_task(self, loadid, graph_id, node_id, operation, language_code, old
                 return {"success": False, "data": {"title": _("Error"), "message": data_staged["message"]}}
 
         if data_updated["success"]:
-            data_updated = self.save_to_tiles(loadid)
+            data_updated = self.save_to_tiles(loadid, finalize_import=False)
             return {"success": True, "data": "done"}
         else:
             with connection.cursor() as cursor:
diff --git a/arches/app/etl_modules/base_import_module.py b/arches/app/etl_modules/base_import_module.py
index a95bed8d76c..b80ebd75a24 100644
--- a/arches/app/etl_modules/base_import_module.py
+++ b/arches/app/etl_modules/base_import_module.py
@@ -46,13 +46,13 @@ def reverse(self, request, **kwargs):
         logger.warn(response)
         return response
 
-    def save_to_tiles(self, loadid, multiprocessing=True):
+    def save_to_tiles(self, loadid, finalize_import=True, multiprocessing=True):
         self.loadid = loadid
         with connection.cursor() as cursor:
             try:
                 cursor.execute("""CALL __arches_prepare_bulk_load();""")
                 cursor.execute("""SELECT * FROM __arches_staging_to_tile(%s)""", [self.loadid])
-                row = cursor.fetchall()
+                saved = cursor.fetchone()[0]
             except (IntegrityError, ProgrammingError) as e:
                 logger.error(e)
                 cursor.execute(
@@ -66,9 +66,16 @@ def save_to_tiles(self, loadid, multiprocessing=True):
                     "message": _("Unable to insert record into staging table"),
                 }
             finally:
-                cursor.execute("""CALL __arches_complete_bulk_load();""")
+                cursor.execute("""alter table tiles enable trigger __arches_check_excess_tiles_trigger;""")
+                cursor.execute("""alter table tiles enable trigger __arches_trg_update_spatial_attributes;""")
 
-            if row[0][0]:
+                if finalize_import:
+                    cursor.execute("""SELECT __arches_refresh_spatial_views();""")
+                    refresh_successful = cursor.fetchone()[0]
+                    if not refresh_successful:
+                        raise Exception('Unable to refresh spatial views')
+
+            if saved:
                 cursor.execute(
                     """UPDATE load_event SET (status, load_end_time) = (%s, %s) WHERE loadid = %s""",
                     ("completed", datetime.now(), loadid),

From e387d6834a3ba5b989e32633f26c68753ecb1e84 Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Mon, 3 Jul 2023 16:03:52 -0700
Subject: [PATCH 11/44] Try catching error after load before index, #9671

---
 arches/app/etl_modules/base_import_module.py  | 41 +++++++++++++------
 arches/app/templates/javascript.htm           |  1 +
 .../views/components/plugins/etl-manager.htm  |  6 +++
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/arches/app/etl_modules/base_import_module.py b/arches/app/etl_modules/base_import_module.py
index b80ebd75a24..95e06441068 100644
--- a/arches/app/etl_modules/base_import_module.py
+++ b/arches/app/etl_modules/base_import_module.py
@@ -66,26 +66,41 @@ def save_to_tiles(self, loadid, finalize_import=True, multiprocessing=True):
                     "message": _("Unable to insert record into staging table"),
                 }
             finally:
-                cursor.execute("""alter table tiles enable trigger __arches_check_excess_tiles_trigger;""")
-                cursor.execute("""alter table tiles enable trigger __arches_trg_update_spatial_attributes;""")
+                try:
+                    cursor.execute("""alter table tiles enable trigger __arches_check_excess_tiles_trigger;""")
+                    cursor.execute("""alter table tiles enable trigger __arches_trg_update_spatial_attributes;""")
 
-                if finalize_import:
-                    cursor.execute("""SELECT __arches_refresh_spatial_views();""")
-                    refresh_successful = cursor.fetchone()[0]
-                    if not refresh_successful:
-                        raise Exception('Unable to refresh spatial views')
+                    if finalize_import:
+                        cursor.execute("""SELECT __arches_refresh_spatial_views();""")
+                        refresh_successful = cursor.fetchone()[0]
+                        if not refresh_successful:
+                            raise Exception('Unable to refresh spatial views')
+                except Exception as e:
+                    logger.exception(e)
+                    cursor.execute(
+                        """UPDATE load_event SET (status, indexed_time, complete, successful) = (%s, %s, %s, %s) WHERE loadid = %s""",
+                        ("unindexed", datetime.now(), True, True, loadid),
+                    )
 
             if saved:
                 cursor.execute(
                     """UPDATE load_event SET (status, load_end_time) = (%s, %s) WHERE loadid = %s""",
                     ("completed", datetime.now(), loadid),
                 )
-                index_resources_by_transaction(loadid, quiet=True, use_multiprocessing=False, recalculate_descriptors=True)
-                cursor.execute(
-                    """UPDATE load_event SET (status, indexed_time, complete, successful) = (%s, %s, %s, %s) WHERE loadid = %s""",
-                    ("indexed", datetime.now(), True, True, loadid),
-                )
-                return {"success": True, "data": "success"}
+                try:
+                    index_resources_by_transaction(loadid, quiet=True, use_multiprocessing=False, recalculate_descriptors=True)
+                    cursor.execute(
+                        """UPDATE load_event SET (status, indexed_time, complete, successful) = (%s, %s, %s, %s) WHERE loadid = %s""",
+                        ("indexed", datetime.now(), True, True, loadid),
+                    )
+                    return {"success": True, "data": "indexed"}
+                except Exception as e:
+                    logger.exception(e)
+                    cursor.execute(
+                        """UPDATE load_event SET (status, load_end_time) = (%s, %s) WHERE loadid = %s""",
+                        ("unindexed", datetime.now(), loadid),
+                    )
+                    return {"success": False, "data": "saved"}
             else:
                 cursor.execute(
                     """UPDATE load_event SET status = %s, load_end_time = %s WHERE loadid = %s""",
diff --git a/arches/app/templates/javascript.htm b/arches/app/templates/javascript.htm
index 6e223c6adf9..079ef31755e 100644
--- a/arches/app/templates/javascript.htm
+++ b/arches/app/templates/javascript.htm
@@ -735,6 +735,7 @@
         remove-from-history='{% trans "remove from history" as removeFromHistory %} "{{ removeFromHistory|escapejs }}"'
         number-of-resources-updated='{% trans "Number of Resources Updated" as numberOfResourcesUpdated %} "{{ numberOfResourcesUpdated|escapejs }}"'
         indexing='{% trans "indexing" as indexing %} "{{ indexing|escapejs }}"'
+        loaded-but-unindexed='{% trans "loaded but unindexed" as loadedButUnindexed %} "{{ loadedButUnindexed|escapejs }}"'
         validating='{% trans "validating" as validating %} "{{ validating|escapejs }}"'
         completed='{% trans "completed" as completed %} "{{ completed|escapejs }}"'
         failed='{% trans "failed" as failed %} "{{ failed|escapejs }}"'
diff --git a/arches/app/templates/views/components/plugins/etl-manager.htm b/arches/app/templates/views/components/plugins/etl-manager.htm
index 3bafd6f0a8a..17e25b09e06 100644
--- a/arches/app/templates/views/components/plugins/etl-manager.htm
+++ b/arches/app/templates/views/components/plugins/etl-manager.htm
@@ -143,6 +143,12 @@ <h4 class="workflow-select-title" data-bind="text: etlmodule.name"></h4>
                                         <i class="fa fa-spin fa-spinner" data-bind="visible: event.loading()"></i>
                                     </button>
                                     <!-- /ko -->
+                                    <!-- ko if: event.status == "unindexed" -->
+                                    <button class="btn btn-success" style="width:150px;">
+                                        <span data-bind="text: $root.translations.loadedButUnindexed"></span>
+                                        <i class="fa fa-spin fa-spinner" data-bind="visible: event.loading()"></i>
+                                    </button>
+                                    <!-- /ko -->
                                     <!-- ko if: event.status == "failed" -->
                                     <button class="btn btn-danger" style="width:150px;">
                                         <span data-bind="text: $root.translations.failed"></span>

From c78beee6fb94e433df21dc845797036f227a82ca Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Mon, 3 Jul 2023 16:33:22 -0700
Subject: [PATCH 12/44] Fix migrations, #9670

---
 .../app/models/migrations/9670_improve_bulk_load_performance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/models/migrations/9670_improve_bulk_load_performance.py b/arches/app/models/migrations/9670_improve_bulk_load_performance.py
index 6139258088b..11e627e44c2 100644
--- a/arches/app/models/migrations/9670_improve_bulk_load_performance.py
+++ b/arches/app/models/migrations/9670_improve_bulk_load_performance.py
@@ -3,7 +3,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("models", "8010_export_permissions"),
+        ("models", "9477_fix_for_spatial_view_dbf_function_edtf_displaying_null"),
     ]
 
     update_check_excess_tiles_trigger = """

From e9c47ee5bf70f3aad6491392935d65e0cb0c9f94 Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Mon, 3 Jul 2023 16:47:06 -0700
Subject: [PATCH 13/44] Update sql syntax, #9670

---
 .../migrations/9670_improve_bulk_load_performance.py      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arches/app/models/migrations/9670_improve_bulk_load_performance.py b/arches/app/models/migrations/9670_improve_bulk_load_performance.py
index 11e627e44c2..a654ad55fa8 100644
--- a/arches/app/models/migrations/9670_improve_bulk_load_performance.py
+++ b/arches/app/models/migrations/9670_improve_bulk_load_performance.py
@@ -82,15 +82,15 @@ class Migration(migrations.Migration):
         language plpgsql;
     """
 
-    create_tileid_index_on_load_staging = """
-        CREATE INDEX IF NOT EXISTS load_staging_tileid ON load_staging;
+    create_index_on_load_staging_tileid = """
+        CREATE INDEX IF NOT EXISTS load_staging_tileid ON load_staging (tileid);
     """
 
-    drop_tileid_index_on_load_staging = """
+    drop_index_on_load_staging_tileid = """
         DROP INDEX IF EXISTS load_staging_tileid;
     """
 
     operations = [
         migrations.RunSQL(update_check_excess_tiles_trigger, restore_check_excess_tiles_trigger),
-        migrations.RunSQL(create_tileid_index_on_load_staging, drop_tileid_index_on_load_staging),
+        migrations.RunSQL(create_index_on_load_staging_tileid, drop_index_on_load_staging_tileid),
     ]

From 4b02d35d097230f273d34e8aac86204efe5d2057 Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Mon, 3 Jul 2023 17:11:38 -0700
Subject: [PATCH 14/44] updates base datatype get_tile_data #9648

---
 arches/app/datatypes/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/datatypes/base.py b/arches/app/datatypes/base.py
index 0bab29928d6..efa6adabc5d 100644
--- a/arches/app/datatypes/base.py
+++ b/arches/app/datatypes/base.py
@@ -193,7 +193,7 @@ def get_tile_data(self, tile):
         except:
             data = tile["data"]
             provisionaledits = tile["provisionaledits"]
-        if data is not None and len(list(data.keys())) > 0:
+        if data is not None and any(data.values()):
             return data
         elif provisionaledits is not None and len(list(provisionaledits.keys())) > 0:
             if len(list(provisionaledits.keys())) > 1:

From ac4c58ac4996e7846f0fa96e4fcc3194c2fd068f Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Wed, 5 Jul 2023 09:18:40 -0700
Subject: [PATCH 15/44] updates datatype index command to handle TypeError
 #9648

---
 arches/app/datatypes/datatypes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/datatypes/datatypes.py b/arches/app/datatypes/datatypes.py
index dadeec7a812..16fabce5728 100644
--- a/arches/app/datatypes/datatypes.py
+++ b/arches/app/datatypes/datatypes.py
@@ -1535,7 +1535,7 @@ def append_to_document(self, document, nodevalue, nodeid, tile, provisional=Fals
             for f in tile.data[str(nodeid)]:
                 val = {"string": f["name"], "nodegroup_id": tile.nodegroup_id, "provisional": provisional}
                 document["strings"].append(val)
-        except KeyError as e:
+        except (KeyError, TypeError) as e:
             for k, pe in tile.provisionaledits.items():
                 for f in pe["value"][nodeid]:
                     val = {"string": f["name"], "nodegroup_id": tile.nodegroup_id, "provisional": provisional}

From b103a89c611fadb076a55ddd694063cf1870a638 Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Wed, 5 Jul 2023 14:12:14 -0700
Subject: [PATCH 16/44] updates labelbasedgraph to handle provisional edits
 #9715

---
 arches/app/utils/label_based_graph_v2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/utils/label_based_graph_v2.py b/arches/app/utils/label_based_graph_v2.py
index d6a17c250aa..67245ce3f72 100644
--- a/arches/app/utils/label_based_graph_v2.py
+++ b/arches/app/utils/label_based_graph_v2.py
@@ -305,7 +305,7 @@ def _get_display_value(cls, tile, serialized_node, datatype_factory):
         # if the serialized_node is unable to collect data, let's explicitly say so
         if datatype_factory.datatypes[serialized_node["datatype"]].defaultwidget is None:
             display_value = NON_DATA_COLLECTING_NODE
-        elif tile.data:
+        elif tile.data or tile.provisionaledits:
             datatype = datatype_factory.get_instance(serialized_node["datatype"])
 
             node_copy = copy.deepcopy(serialized_node)

From 4955bfa11db0adb8a983b43422c6c8750fe237ed Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Thu, 6 Jul 2023 09:28:59 -0700
Subject: [PATCH 17/44] Patch upgrade for django

---
 arches/install/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/install/requirements.txt b/arches/install/requirements.txt
index 4e31037bd09..9b42a32a8d0 100644
--- a/arches/install/requirements.txt
+++ b/arches/install/requirements.txt
@@ -1,4 +1,4 @@
-Django==3.2.18
+Django==3.2.20
 psycopg2==2.9.6
 elasticsearch>=7.11.0,<8.0.0
 rdflib==4.2.2

From 49a2d6f2de8e4942c488571c6fc206a74137715e Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Fri, 7 Jul 2023 12:24:53 -0700
Subject: [PATCH 18/44] PR changes #9648

---
 .../9648_add_empty_key_value_pairs_to_tiles.py    | 15 ++++++++++++---
 arches/app/models/models.py                       |  8 ++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py b/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py
index 3a7a633b9aa..496bf4f360c 100644
--- a/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py
+++ b/arches/app/models/migrations/9648_add_empty_key_value_pairs_to_tiles.py
@@ -8,13 +8,22 @@ class Migration(migrations.Migration):
 
     def forwards_func(apps, schema_editor):
         TileModel = apps.get_model("models", "TileModel")
+        Node = apps.get_model("models", "Node")
 
-        for tile in TileModel.objects.all():
-            tile.save()  # should trigger new code in `TileModel.save` method that adds empty key/value pairs to tile data
+        for tile in TileModel.objects.filter(data={}, provisionaledits__isnull=False):
+            for node in Node.objects.filter(nodegroup_id=tile.nodegroup_id):
+                if not str(node.pk) in tile.data:
+                    tile.data[str(node.pk)] = None
+            tile.save() 
 
     def reverse_func(apps, schema_editor):
-        pass
+        TileModel = apps.get_model("models", "TileModel")
 
+        for tile in TileModel.objects.filter(provisionaledits__isnull=False):
+            if bool(tile.provisionaledits and not any(tile.data.values())):
+                tile.data = {}
+                tile.save()
+                
     operations = [
         migrations.RunPython(forwards_func, reverse_func),
     ]
diff --git a/arches/app/models/models.py b/arches/app/models/models.py
index c216a5630b4..b6eca170df3 100644
--- a/arches/app/models/models.py
+++ b/arches/app/models/models.py
@@ -1104,11 +1104,11 @@ def is_fully_provisional(self):
         return bool(self.provisionaledits and not any(self.data.values()))
 
     def save(self, *args, **kwargs):
-        for node in Node.objects.filter(nodegroup_id=self.nodegroup_id):
-            if not str(node.pk) in self.data:
-                self.data[str(node.pk)] = None
-
         if self.sortorder is None or self.is_fully_provisional():
+            for node in Node.objects.filter(nodegroup_id=self.nodegroup_id):
+                if not str(node.pk) in self.data:
+                    self.data[str(node.pk)] = None
+
             sortorder_max = TileModel.objects.filter(
                 nodegroup_id=self.nodegroup_id, resourceinstance_id=self.resourceinstance_id
             ).aggregate(Max("sortorder"))["sortorder__max"]

From efe77694ac08b37075f83fd13f2f72c00bff1b83 Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Fri, 7 Jul 2023 13:13:45 -0700
Subject: [PATCH 19/44] reverses changes to tests since updating TileModel.save
 logic #9648

---
 tests/importer/jsonld_import_tests.py | 70 +++++++++------------------
 1 file changed, 23 insertions(+), 47 deletions(-)

diff --git a/tests/importer/jsonld_import_tests.py b/tests/importer/jsonld_import_tests.py
index 1a9978282fe..94aaaa7b840 100644
--- a/tests/importer/jsonld_import_tests.py
+++ b/tests/importer/jsonld_import_tests.py
@@ -1275,26 +1275,14 @@ def get_tile_by_id(tiles, tileid):
         tile1 = get_tiles_by_nodegroup(tiles, "e717dda0-1540-11ea-b353-acde48001122", "f025e108-1540-11ea-b353-acde48001122", 6)
         tile1_parent = get_tile_by_id(tiles, tile1.parenttile_id)
 
-        self.assertEqual(
-            tile1_parent.data, 
-            {
-                'c5a9174c-1540-11ea-b353-acde48001122': None,
-                'd155a4c0-1540-11ea-b353-acde48001122': None,
-                'ddc44d9c-1540-11ea-b353-acde48001122': None
-            }
-        )
+        self.assertEqual(tile1_parent.data, {})
         tile1_grandparent = get_tile_by_id(tiles, tile1_parent.parenttile_id)
         self.assertEqual(tile1_grandparent.data["02ec0ace-1541-11ea-b353-acde48001122"]["en"], {"direction": "ltr", "value": "second part"})
 
         tile2 = get_tiles_by_nodegroup(tiles, "e717dda0-1540-11ea-b353-acde48001122", "f025e108-1540-11ea-b353-acde48001122", 1)
         tile2_parent = get_tile_by_id(tiles, tile2.parenttile_id)
         self.assertEqual(
-            tile2_parent.data, 
-            {
-                'c5a9174c-1540-11ea-b353-acde48001122': None,
-                "d155a4c0-1540-11ea-b353-acde48001122": "2019-12-03", 
-                "ddc44d9c-1540-11ea-b353-acde48001122": "2019-12-05"
-            }
+            tile2_parent.data, {"d155a4c0-1540-11ea-b353-acde48001122": "2019-12-03", "ddc44d9c-1540-11ea-b353-acde48001122": "2019-12-05"}
         )
         tile2_grandparent = get_tile_by_id(tiles, tile2_parent.parenttile_id)
         self.assertEqual(tile2_grandparent.data["02ec0ace-1541-11ea-b353-acde48001122"]["en"], {"direction": "ltr", "value": "asdf"})
@@ -1302,30 +1290,24 @@ def get_tile_by_id(tiles, tileid):
             tile2_grandparent.data["26927e22-1541-11ea-b353-acde48001122"][0]["resourceId"], "5e9baff0-109b-11ea-957a-acde48001122"
         )
         tile2_greatgrandparent = get_tile_by_id(tiles, tile2_grandparent.parenttile_id)
-        self.assertEqual(tile2_greatgrandparent.data, {'af6c5d36-1540-11ea-b353-acde48001122': None})
+        self.assertEqual(tile2_greatgrandparent.data, {})
 
         tile1_greatgrandparent = get_tile_by_id(tiles, tile1_grandparent.parenttile_id)
         self.assertEqual(tile2_greatgrandparent, tile1_greatgrandparent)
 
         tile3 = get_tiles_by_nodegroup(tiles, "c5a9174c-1540-11ea-b353-acde48001122", "d155a4c0-1540-11ea-b353-acde48001122", "2019-12-07")
         self.assertEqual(
-            tile3.data, 
-            {
-                'c5a9174c-1540-11ea-b353-acde48001122': None,
-                "d155a4c0-1540-11ea-b353-acde48001122": "2019-12-07", 
-                "ddc44d9c-1540-11ea-b353-acde48001122": "2019-12-08"
-            }
+            tile3.data, {"d155a4c0-1540-11ea-b353-acde48001122": "2019-12-07", "ddc44d9c-1540-11ea-b353-acde48001122": "2019-12-08"}
         )
         tile3_parent = get_tile_by_id(tiles, tile3.parenttile_id)
         self.assertEqual(tile3_parent.data["02ec0ace-1541-11ea-b353-acde48001122"]["en"], {"direction": "ltr", "value": "bar"})
         tile3_grandparent = get_tile_by_id(tiles, tile3_parent.parenttile_id)
-        self.assertEqual(tile3_grandparent.data, {'af6c5d36-1540-11ea-b353-acde48001122': None})
+        self.assertEqual(tile3_grandparent.data, {})
 
         tile4 = get_tiles_by_nodegroup(tiles, "48f3ab3a-1541-11ea-b353-acde48001122")[0]
         self.assertEqual(
             tile4.data,
             {
-                '48f3ab3a-1541-11ea-b353-acde48001122': None,
                 "54272cd4-1541-11ea-b353-acde48001122": ["d2908ab9-19a6-4a82-953d-5ebe8d164e85"],
                 "8e08a496-1541-11ea-b353-acde48001122": None,
             },
@@ -1426,19 +1408,17 @@ def test_8181_import_bug(self):
             actual_tiledata.append(tile.data)
 
         expected_tiledata = [
-            {'f13ffd9c-3e76-11ec-9a49-faffc210b420': {'en': {'value': 'ALLAN, DAVID', 'direction': 'ltr'}}}, 
+            {"f13ffd9c-3e76-11ec-9a49-faffc210b420": {"en": {"value": "ALLAN, DAVID", "direction": "ltr"}}},
             {
-                'f1403424-3e76-11ec-9a49-faffc210b420': None, 
-                'f1417e1a-3e76-11ec-9a49-faffc210b420': ['b83cab06-1cfe-4aeb-9653-cb9f0cc45595'], 
-                'f1420740-3e76-11ec-9a49-faffc210b420': None, 
-                'f1420f92-3e76-11ec-9a49-faffc210b420': None
-            }, 
+                "f1420740-3e76-11ec-9a49-faffc210b420": None,
+                "f1420f92-3e76-11ec-9a49-faffc210b420": None,
+                "f1417e1a-3e76-11ec-9a49-faffc210b420": ["b83cab06-1cfe-4aeb-9653-cb9f0cc45595"],
+            },
             {
-                'f1403424-3e76-11ec-9a49-faffc210b420': None, 
-                'f1417e1a-3e76-11ec-9a49-faffc210b420': ['fc3559c4-03c4-428c-a48e-0f480c8a3751'], 
-                'f1420740-3e76-11ec-9a49-faffc210b420': None, 
-                'f1420f92-3e76-11ec-9a49-faffc210b420': None
-            }
+                "f1420740-3e76-11ec-9a49-faffc210b420": None,
+                "f1420f92-3e76-11ec-9a49-faffc210b420": None,
+                "f1417e1a-3e76-11ec-9a49-faffc210b420": ["fc3559c4-03c4-428c-a48e-0f480c8a3751"],
+            },
         ]
         self.assertCountEqual(actual_tiledata, expected_tiledata)
 
@@ -1492,21 +1472,17 @@ def test_8181_import_bug_2(self):
             actual_tiledata.append(tile.data)
 
         expected_tiledata = [
+            {"f13ffd9c-3e76-11ec-9a49-faffc210b420": {"en": {"value": "ALLAN, DAVID", "direction": "ltr"}}},
             {
-                'f1403424-3e76-11ec-9a49-faffc210b420': None, 
-                'f1417e1a-3e76-11ec-9a49-faffc210b420': ['b83cab06-1cfe-4aeb-9653-cb9f0cc45595'], 
-                'f1420740-3e76-11ec-9a49-faffc210b420': None, 
-                'f1420f92-3e76-11ec-9a49-faffc210b420': None
-            }, 
-            {
-                'f1403424-3e76-11ec-9a49-faffc210b420': None, 
-                'f1417e1a-3e76-11ec-9a49-faffc210b420': ['fc3559c4-03c4-428c-a48e-0f480c8a3751'], 
-                'f1420740-3e76-11ec-9a49-faffc210b420': None, 
-                'f1420f92-3e76-11ec-9a49-faffc210b420': None
-            }, 
+                "f1420740-3e76-11ec-9a49-faffc210b420": None,
+                "f1420f92-3e76-11ec-9a49-faffc210b420": None,
+                "f1417e1a-3e76-11ec-9a49-faffc210b420": ["b83cab06-1cfe-4aeb-9653-cb9f0cc45595"],
+            },
             {
-                'f13ffd9c-3e76-11ec-9a49-faffc210b420': {'en': {'value': 'ALLAN, DAVID', 'direction': 'ltr'}}
-            }
+                "f1420740-3e76-11ec-9a49-faffc210b420": None,
+                "f1420f92-3e76-11ec-9a49-faffc210b420": None,
+                "f1417e1a-3e76-11ec-9a49-faffc210b420": ["fc3559c4-03c4-428c-a48e-0f480c8a3751"],
+            },
         ]
         self.assertCountEqual(actual_tiledata, expected_tiledata)
 

From eae4a83a542a09ab8941692670298da2f1d808c3 Mon Sep 17 00:00:00 2001
From: Alexei Peters <apeters@fargeo.com>
Date: Fri, 7 Jul 2023 17:50:23 -0700
Subject: [PATCH 20/44] fix type cast issue with
 __arches_create_resource_x_resource_relationships function, re #9746

---
 .../9746_related_resource_post_save_bug.py    | 222 ++++++++++++++++++
 1 file changed, 222 insertions(+)
 create mode 100644 arches/app/models/migrations/9746_related_resource_post_save_bug.py

diff --git a/arches/app/models/migrations/9746_related_resource_post_save_bug.py b/arches/app/models/migrations/9746_related_resource_post_save_bug.py
new file mode 100644
index 00000000000..af543716725
--- /dev/null
+++ b/arches/app/models/migrations/9746_related_resource_post_save_bug.py
@@ -0,0 +1,222 @@
+# Generated by Django 3.2.19 on 2023-07-07 19:09
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('models', '9648_add_empty_key_value_pairs_to_tiles'),
+    ]
+
+    forward_sql = """
+        CREATE OR REPLACE FUNCTION public.__arches_create_resource_x_resource_relationships(IN tile_id uuid)
+        RETURNS boolean
+        LANGUAGE 'plpgsql'
+        VOLATILE
+        PARALLEL UNSAFE
+        COST 100
+    
+        AS $BODY$
+        DECLARE
+            resourceinstancefrom_id uuid;
+            from_graphid uuid;
+            relational_count text;
+            val boolean = true;
+        BEGIN
+            select count(*) into relational_count from tiles where tiledata::text like '%resourceX%' and tileid = tile_id;
+
+            IF relational_count = '0' 
+                THEN 
+                RETURN false;
+            END IF; 
+                
+            --https://dbfiddle.uk/?rdbms=postgres_12&fiddle=21e25754f355a492dfd7b4a134182d2e
+
+            SELECT resourceinstanceid INTO resourceinstancefrom_id FROM tiles WHERE tileid = tile_id; 
+            SELECT graphid INTO from_graphid FROM resource_instances WHERE resourceinstanceid = resourceinstancefrom_id; 
+
+            DELETE FROM resource_x_resource WHERE tileid = tile_id;
+
+            WITH updated_tiles as (
+                select * from tiles t
+                WHERE
+                    t.tileid = tile_id
+            )
+            , relationships AS (
+                SELECT n.nodeid, n.config,
+                    jsonb_array_elements(tt.tiledata->n.nodeid::text) AS relationship
+                FROM updated_tiles tt
+                    LEFT JOIN nodes n ON tt.nodegroupid = n.nodegroupid
+                WHERE n.datatype IN ('resource-instance-list', 'resource-instance')
+                    AND tt.tiledata->>n.nodeid::text IS NOT null
+            )
+            , relationships2 AS (
+                SELECT r.nodeid, r.config, r.relationship, (SELECT ri.graphid
+                    FROM resource_instances ri
+                    WHERE (r.relationship->>'resourceId')::uuid = ri.resourceinstanceid) AS to_graphid
+                FROM relationships r
+            )
+            , relationships3 AS (
+                SELECT fr.nodeid, fr.relationship, fr.to_graphid, 
+                (
+                    SELECT graphs->>'ontologyProperty'
+                    FROM jsonb_array_elements(fr.config->'graphs') AS graphs
+                    WHERE graphs->>'graphid' = fr.to_graphid::text
+                ) AS defaultOntologyProperty,
+                (
+                    SELECT graphs->>'inverseOntologyProperty'
+                    FROM jsonb_array_elements(fr.config->'graphs') AS graphs
+                    WHERE graphs->>'graphid' = fr.to_graphid::text
+                ) AS defaultInverseOntologyProperty
+                FROM relationships2 fr
+            )
+
+            INSERT INTO resource_x_resource (
+                resourcexid,
+                notes,
+                relationshiptype,
+                inverserelationshiptype,
+                resourceinstanceidfrom,
+                resourceinstanceidto,
+                resourceinstancefrom_graphid,
+                resourceinstanceto_graphid,
+                tileid,
+                nodeid,
+                created,
+                modified
+            ) (SELECT
+                CASE relationship->>'resourceXresourceId'
+                    WHEN '' THEN uuid_generate_v4()
+                    ELSE (relationship->>'resourceXresourceId')::uuid
+                END,
+                '',
+                CASE relationship->>'ontologyProperty'
+                    WHEN '' THEN defaultOntologyProperty
+                    ELSE relationship->>'ontologyProperty'
+                END,
+                CASE relationship->>'inverseOntologyProperty'
+                    WHEN '' THEN defaultInverseOntologyProperty
+                    ELSE relationship->>'inverseOntologyProperty'
+                END,
+                resourceinstancefrom_id,
+                (relationship->>'resourceId')::uuid,
+                from_graphid,
+                to_graphid,
+                tile_id,
+                nodeid,
+                now(),
+                now()
+            FROM relationships3);
+            RETURN val;
+        END;
+        $BODY$;
+    """
+
+    reverse_sql = """
+        CREATE OR REPLACE FUNCTION public.__arches_create_resource_x_resource_relationships(IN tile_id uuid)
+        RETURNS boolean
+        LANGUAGE 'plpgsql'
+        VOLATILE
+        PARALLEL UNSAFE
+        COST 100
+    
+        AS $BODY$
+        DECLARE
+            resourceinstancefrom_id uuid;
+            from_graphid uuid;
+            relational_count text;
+            val boolean = true;
+        BEGIN
+            select count(*) into relational_count from tiles where tiledata::text like '%resourceX%' and tileid = tile_id;
+
+            IF relational_count = '0' 
+                THEN 
+                RETURN false;
+            END IF; 
+                
+            --https://dbfiddle.uk/?rdbms=postgres_12&fiddle=21e25754f355a492dfd7b4a134182d2e
+
+            SELECT resourceinstanceid INTO resourceinstancefrom_id FROM tiles WHERE tileid = tile_id; 
+            SELECT graphid INTO from_graphid FROM resource_instances WHERE resourceinstanceid = resourceinstancefrom_id; 
+
+            DELETE FROM resource_x_resource WHERE tileid = tile_id;
+
+            WITH updated_tiles as (
+                select * from tiles t
+                WHERE
+                    t.tileid = tile_id
+            )
+            , relationships AS (
+                SELECT n.nodeid, n.config,
+                    jsonb_array_elements(tt.tiledata->n.nodeid::text) AS relationship
+                FROM updated_tiles tt
+                    LEFT JOIN nodes n ON tt.nodegroupid = n.nodegroupid
+                WHERE n.datatype IN ('resource-instance-list', 'resource-instance')
+                    AND tt.tiledata->>n.nodeid::text IS NOT null
+            )
+            , relationships2 AS (
+                SELECT r.nodeid, r.config, r.relationship, (SELECT ri.graphid
+                    FROM resource_instances ri
+                    WHERE r.relationship->>'resourceId' = ri.resourceinstanceid::text) AS to_graphid
+                FROM relationships r
+            )
+            , relationships3 AS (
+                SELECT fr.nodeid, fr.relationship, fr.to_graphid, 
+                (
+                    SELECT graphs->>'ontologyProperty'
+                    FROM jsonb_array_elements(fr.config->'graphs') AS graphs
+                    WHERE graphs->>'graphid' = fr.to_graphid::text
+                ) AS defaultOntologyProperty,
+                (
+                    SELECT graphs->>'inverseOntologyProperty'
+                    FROM jsonb_array_elements(fr.config->'graphs') AS graphs
+                    WHERE graphs->>'graphid' = fr.to_graphid::text
+                ) AS defaultInverseOntologyProperty
+                FROM relationships2 fr
+            )
+
+            INSERT INTO resource_x_resource (
+                resourcexid,
+                notes,
+                relationshiptype,
+                inverserelationshiptype,
+                resourceinstanceidfrom,
+                resourceinstanceidto,
+                resourceinstancefrom_graphid,
+                resourceinstanceto_graphid,
+                tileid,
+                nodeid,
+                created,
+                modified
+            ) (SELECT
+                CASE relationship->>'resourceXresourceId'
+                    WHEN '' THEN uuid_generate_v4()
+                    ELSE (relationship->>'resourceXresourceId')::uuid
+                END,
+                '',
+                CASE relationship->>'ontologyProperty'
+                    WHEN '' THEN defaultOntologyProperty
+                    ELSE relationship->>'ontologyProperty'
+                END,
+                CASE relationship->>'inverseOntologyProperty'
+                    WHEN '' THEN defaultInverseOntologyProperty
+                    ELSE relationship->>'inverseOntologyProperty'
+                END,
+                resourceinstancefrom_id,
+                (relationship->>'resourceId')::uuid,
+                from_graphid,
+                to_graphid,
+                tile_id,
+                nodeid,
+                now(),
+                now()
+            FROM relationships3);
+            RETURN val;
+        END;
+        $BODY$;
+    """
+
+    operations = [
+        migrations.RunSQL(forward_sql, reverse_sql),
+    ]

From 30847d565a9be7811e07c7b5a087d9cd8eb4d863 Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Sun, 9 Jul 2023 06:17:18 -0700
Subject: [PATCH 21/44] Handles for blank lines in branch excel, re #9750

---
 arches/app/etl_modules/branch_csv_importer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/etl_modules/branch_csv_importer.py b/arches/app/etl_modules/branch_csv_importer.py
index 6f437b8e987..6720cd25787 100644
--- a/arches/app/etl_modules/branch_csv_importer.py
+++ b/arches/app/etl_modules/branch_csv_importer.py
@@ -140,7 +140,7 @@ def process_worksheet(self, worksheet, cursor, node_lookup, nodegroup_lookup):
         row_count = 0
         for row in worksheet.rows:
             cell_values = [cell.value for cell in row]
-            if len(cell_values) == 0:
+            if len(cell_values) == 0 or any(cell_values) is False:
                 continue
             resourceid = cell_values[0]
             if resourceid is None:

From 2afa9c8347d793c4c3e6ae866f28f96b0191e9e7 Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Fri, 14 Jul 2023 12:57:50 -0700
Subject: [PATCH 22/44] Pass missing args to bulkdisambiguatedresource api
 endpoint

---
 arches/app/views/api.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arches/app/views/api.py b/arches/app/views/api.py
index fe2b4c690bd..816119e8ee1 100644
--- a/arches/app/views/api.py
+++ b/arches/app/views/api.py
@@ -1441,10 +1441,12 @@ def get(self, request):
         version = request.GET.get("v")
         hide_hidden_nodes = bool(request.GET.get("hidden", "true").lower() == "false")
         compact = bool(request.GET.get("uncompacted", "false").lower() == "false")
+        user = request.user
+        perm = "read_nodegroup"
 
         return JSONResponse(
             {
-                resource.pk: resource.to_json(compact=compact, version=version, hide_hidden_nodes=hide_hidden_nodes)
+                resource.pk: resource.to_json(compact=compact, version=version, hide_hidden_nodes=hide_hidden_nodes, user=user, perm=perm)
                 for resource in Resource.objects.filter(pk__in=resource_ids)
             }
         )

From 11d4bda677c221926fa877a49b40584c81204ca1 Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Fri, 14 Jul 2023 13:14:18 -0700
Subject: [PATCH 23/44] Sets default width, re #8419

---
 arches/app/media/css/arches.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arches/app/media/css/arches.scss b/arches/app/media/css/arches.scss
index 9e463a4c7f1..d208ec0a213 100644
--- a/arches/app/media/css/arches.scss
+++ b/arches/app/media/css/arches.scss
@@ -13921,7 +13921,8 @@ a.jstree-anchor.permissions-widget {
 }
 
 .iiif-widget-report {
-    margin: 0 0 0 320px;
+    width: 425px;
+    margin: 0 20px 10px 0px;
 }
 
 .iiif-widget-report .iiif-leaflet {

From a12711eb28211576eb4269e6a03124228ddeac6f Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Fri, 14 Jul 2023 16:09:09 -0700
Subject: [PATCH 24/44] Update js dep patch releases

---
 package.json |   14 +-
 yarn.lock    | 1549 ++++++++++++++++++++++++--------------------------
 2 files changed, 761 insertions(+), 802 deletions(-)

diff --git a/package.json b/package.json
index 1fa0ca4d9d2..7f14cbba835 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
         "type": "git"
     },
     "dependencies": {
-        "@mapbox/geojson-extent": "0.3.2",
+        "@mapbox/geojson-extent": "~1.0.1",
         "@mapbox/geojsonhint": "^3.0.0",
         "@mapbox/mapbox-gl-draw": "1.1.2",
         "@mapbox/mapbox-gl-geocoder": "^4.4.0",
@@ -30,16 +30,16 @@
         "datatables.net-responsive-bs": "~2.3.0",
         "dom4": "^2.0.1",
         "dropzone": "5.7.0",
-        "eonasdan-bootstrap-datetimepicker": "4.17.44",
+        "eonasdan-bootstrap-datetimepicker": "~4.17.49",
         "font-awesome": "~4.6.3",
         "ionicons": "~2.0.1",
         "jqtree": "1.3.4",
         "jquery": "^3.6.1",
-        "jquery-migrate": "3.4.0",
+        "jquery-migrate": "~3.4.1",
         "jquery-validation": "1.19.5",
         "jqueryui": "1.11.1",
         "js-cookie": "2.1.1",
-        "knockout": "3.5.0",
+        "knockout": "~3.5.1",
         "knockout-mapping": "~2.6.0",
         "knockstrap": "1.3.2",
         "latlon-geohash": "1.1.0",
@@ -51,15 +51,15 @@
         "mapbox-gl": "^1.8.1",
         "metismenu": "2.7.2",
         "moment": "^2.29.4",
-        "moment-timezone": "0.5.34",
+        "moment-timezone": "~0.5.43",
         "nouislider": "11.0.3",
         "numeral": "^2.0.6",
         "proj4": "^2.3.15",
         "requirejs": "~2.3.2",
         "requirejs-plugins": "1.0.2",
-        "requirejs-text": "2.0.12",
+        "requirejs-text": "~2.0.16",
         "select2": "3.5.1",
-        "underscore": "1.13.4",
+        "underscore": "~1.13.6",
         "uuidjs": "^3.3.0"
     }
 }
diff --git a/yarn.lock b/yarn.lock
index 820df2778db..2e788cebbd0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,30 +3,30 @@
 
 
 "@babel/code-frame@^7.0.0":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
+  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
   dependencies:
-    "@babel/highlight" "^7.10.4"
+    "@babel/highlight" "^7.22.5"
 
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+"@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
 
-"@babel/highlight@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
-  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
+"@babel/highlight@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
+  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.22.5"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
 "@mapbox/extent@0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@mapbox/extent/-/extent-0.4.0.tgz#3e591f32e1f0c3981c864239f7b0ac06e610f8a9"
-  integrity sha1-PlkfMuHww5gchkI597CsBuYQ+Kk=
+  integrity sha512-MSoKw3qPceGuupn04sdaJrFeLKvcSETVLZCGS8JA9x6zXQL3FWiKaIXYIZEDXd5jpXpWlRxinCZIN49yRy0C9A==
 
 "@mapbox/fusspot@^0.4.0":
   version "0.4.0"
@@ -39,40 +39,58 @@
 "@mapbox/geojson-area@^0.2.1", "@mapbox/geojson-area@^0.2.2":
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/@mapbox/geojson-area/-/geojson-area-0.2.2.tgz#18d7814aa36bf23fbbcc379f8e26a22927debf10"
-  integrity sha1-GNeBSqNr8j+7zDefjiaiKSfevxA=
+  integrity sha512-bBqqFn1kIbLBfn7Yq1PzzwVkPYQr9lVUeT8Dhd0NL5n76PBuXzOcuLV7GOSbEB1ia8qWxH4COCvFpziEu/yReA==
   dependencies:
     wgs84 "0.0.0"
 
 "@mapbox/geojson-coords@0.0.0":
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/@mapbox/geojson-coords/-/geojson-coords-0.0.0.tgz#4847a5b96059666e527a2139e75e35d84fd58f50"
-  integrity sha1-SEeluWBZZm5SeiE551412E/Vj1A=
+  integrity sha512-xCFWhmHWlfthXqZtgip0QqgERIPrwx2EdayDn4VQYYpICEdiIs92SdG/ojYZwaxXGa+fOgcVOuKvSxzdtu3rfA==
   dependencies:
     "@mapbox/geojson-normalize" "0.0.1"
     geojson-flatten "~0.2.1"
 
-"@mapbox/geojson-extent@0.3.2", "@mapbox/geojson-extent@^0.3.2":
+"@mapbox/geojson-coords@0.0.2":
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/@mapbox/geojson-coords/-/geojson-coords-0.0.2.tgz#f73d5744c832de0f05c48899f16a4288cefb2606"
+  integrity sha512-YuVzpseee/P1T5BWyeVVPppyfmuXYHFwZHmybkqaMfu4BWlOf2cmMGKj2Rr92MwfSTOCSUA0PAsVGRG8akY0rg==
+  dependencies:
+    "@mapbox/geojson-normalize" "0.0.1"
+    geojson-flatten "^1.0.4"
+
+"@mapbox/geojson-extent@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@mapbox/geojson-extent/-/geojson-extent-0.3.2.tgz#a1bdb2015afd0e031c18c3f29f7eb229e4e1950f"
-  integrity sha1-ob2yAVr9DgMcGMPyn36yKeThlQ8=
+  integrity sha512-Wl2al5bU7eYedc0c6SG2Pmfkj2iX3eVj2xUa8RAsR/0iFMiHX4n2j5aHus0EpJVc8T34jr8xWJSjWYVR1oNDMw==
   dependencies:
     "@mapbox/extent" "0.4.0"
     "@mapbox/geojson-coords" "0.0.0"
     rw "~0.1.4"
     traverse "~0.6.6"
 
+"@mapbox/geojson-extent@~1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@mapbox/geojson-extent/-/geojson-extent-1.0.1.tgz#bd99a6b66ba98e63a29511c9cd1bbd1df4c1e203"
+  integrity sha512-hh8LEO3djT4fqfr8sSC6wKt+p0TMiu+KOLMBUiFOyj+zGq7+IXwQGl0ppCVDkyzCewyd9LoGe9zAvDxXrLfhLw==
+  dependencies:
+    "@mapbox/extent" "0.4.0"
+    "@mapbox/geojson-coords" "0.0.2"
+    rw "~0.1.4"
+    traverse "~0.6.6"
+
 "@mapbox/geojson-normalize@0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@mapbox/geojson-normalize/-/geojson-normalize-0.0.1.tgz#1da1e6b3a7add3ad29909b30f438f60581b7cd80"
-  integrity sha1-HaHms6et060pkJsw9Dj2BYG3zYA=
+  integrity sha512-82V7YHcle8lhgIGqEWwtXYN5cy0QM/OHq3ypGhQTbvHR57DF0vMHMjjVSQKFfVXBe/yWCBZTyOuzvK7DFFnx5Q==
 
-"@mapbox/geojson-rewind@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.0.tgz#91f0ad56008c120caa19414b644d741249f4f560"
-  integrity sha512-73l/qJQgj/T/zO1JXVfuVvvKDgikD/7D/rHAD28S9BG1OTstgmftrmqfCx4U+zQAmtsB6HcDA3a7ymdnJZAQgg==
+"@mapbox/geojson-rewind@^0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a"
+  integrity sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==
   dependencies:
-    concat-stream "~2.0.0"
-    minimist "^1.2.5"
+    get-stream "^6.0.1"
+    minimist "^1.2.6"
 
 "@mapbox/geojson-types@^1.0.2":
   version "1.0.2"
@@ -91,20 +109,20 @@
     vfile-reporter "^5.1.1"
 
 "@mapbox/geojsonhint@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/geojsonhint/-/geojsonhint-3.0.0.tgz#42448232ce4236cb89c1b69c36b0cadeac99e02e"
-  integrity sha512-zHcyh1rDHYnEBd6NvOWoeHLuvazlDkIjvz9MJx4cKwcKTlfrqgxVnTv1QLnVJnsSU5neJnhQJcgscR/Zl4uYgw==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/geojsonhint/-/geojsonhint-3.2.0.tgz#3bf88d3f22a90dcdebca175c761fb4e8a31a822e"
+  integrity sha512-2gvaeDq0uGZ2jiKsdKBd2u3HJD6h0H1GzDnZjH3nVQHyyig3aNFNrMMqDYn0XipkQvkKGU96Y971qsJM1qpDdw==
   dependencies:
     concat-stream "^1.6.1"
     jsonlint-lines "1.7.1"
-    minimist "1.2.0"
+    minimist "^1.2.8"
     vfile "^4.0.0"
     vfile-reporter "^5.1.1"
 
 "@mapbox/jsonlint-lines-primitives@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234"
-  integrity sha1-zlblOfg1UrWNENZy6k1vya3HsjQ=
+  integrity sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==
 
 "@mapbox/mapbox-gl-draw@1.1.2":
   version "1.1.2"
@@ -121,11 +139,11 @@
     xtend "^4.0.1"
 
 "@mapbox/mapbox-gl-geocoder@^4.4.0":
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-geocoder/-/mapbox-gl-geocoder-4.7.0.tgz#ff3b3b6a8e89e4c62df46be8e95502b6c5e510bc"
-  integrity sha512-Fy4jlWWCQt2jKsQ7Agt2nDF1bEY9easOBJVE+yXdpC2D/y/FPnXEQkj9ryhZL05j1iQVOIyU87pM3GI3ETmOVA==
+  version "4.7.4"
+  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-geocoder/-/mapbox-gl-geocoder-4.7.4.tgz#0005eb280d1a8c1dd380dc55c64db6fff3ab5d78"
+  integrity sha512-9PIilTgqnoSCVtzJ1MnE4f1siWIpC9GO5MPaKTOspb7hXIvcgFOp44PSWP+WlDTHoEze3Dz3WQuppti6TVWjyg==
   dependencies:
-    "@mapbox/mapbox-sdk" "^0.11.0"
+    "@mapbox/mapbox-sdk" "^0.13.2"
     lodash.debounce "^4.0.6"
     nanoid "^2.0.1"
     subtag "^0.5.0"
@@ -137,17 +155,17 @@
   resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz#f60b6a55a5d8e5ee908347d2ce4250b15103dc8e"
   integrity sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg==
 
-"@mapbox/mapbox-sdk@^0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-sdk/-/mapbox-sdk-0.11.0.tgz#7aabc10f72480520b8f26e179a69dbab2f9342e5"
-  integrity sha512-NNFctJEq2JmcIXBRoQe5QZi2XbxgFFKxnbrD4M7Mb/HRFMetb6jq7+eAwCzgb0UVQM+nXP7YCO43hINq/SuT6g==
+"@mapbox/mapbox-sdk@^0.13.2":
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-sdk/-/mapbox-sdk-0.13.7.tgz#05e1bf287d86868623d748c19865b1fee7222642"
+  integrity sha512-JZjBsAVSBv7lX7gQPOQwftBGHIUcvL/tPKFxAL+SCT7u1n+eRH052XebOTkl28pNm7Du6DpKAs1GvgUnDcFFDQ==
   dependencies:
     "@mapbox/fusspot" "^0.4.0"
     "@mapbox/parse-mapbox-token" "^0.2.0"
     "@mapbox/polyline" "^1.0.0"
     eventemitter3 "^3.1.0"
     form-data "^3.0.0"
-    got "^8.3.2"
+    got "^11.8.5"
     is-plain-obj "^1.1.0"
     xtend "^4.0.1"
 
@@ -161,24 +179,24 @@
 "@mapbox/point-geometry@0.1.0", "@mapbox/point-geometry@^0.1.0", "@mapbox/point-geometry@~0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2"
-  integrity sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI=
+  integrity sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==
 
 "@mapbox/polyline@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@mapbox/polyline/-/polyline-1.1.1.tgz#ab96e5e6936f4847a4894e14558daf43e40e3bd2"
-  integrity sha512-z9Sl7NYzsEIrAza658H92mc0OvpBjQwjp7Snv4xREKhsCMat7m1IKdWJMjQ5opiPYa0veMf7kCaSd1yx55AhmQ==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/polyline/-/polyline-1.2.0.tgz#11f7481968a83bd9dde36273a50b8037af24a86b"
+  integrity sha512-sIIi9clVZiTmXYqbXpSAoG+ZLsvQn7j9FJLqiNOG85KnXN8tz11MEhuW2M7NDEDIKi4hIMaSI1CKwH8oLuVxPQ==
   dependencies:
     meow "^6.1.1"
 
 "@mapbox/tiny-sdf@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-1.1.1.tgz#16a20c470741bfe9191deb336f46e194da4a91ff"
-  integrity sha512-Ihn1nZcGIswJ5XGbgFAvVumOgWpvIjBX9jiRlIl46uQG9vJOF51ViBYHF95rEZupuyQbEmhLaDPLQlU7fUTsBg==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz#424c620a96442b20402552be70a7f62a8407cc59"
+  integrity sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw==
 
 "@mapbox/unitbezier@^0.0.0":
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e"
-  integrity sha1-FWUb1VOme4WB+zmIEMmK2Go0Uk4=
+  integrity sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==
 
 "@mapbox/vector-tile@^1.3.1":
   version "1.3.1"
@@ -192,20 +210,27 @@
   resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"
   integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==
 
-"@sindresorhus/is@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
-  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
+"@sindresorhus/is@^4.0.0":
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
+  integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
+
+"@szmarczak/http-timer@^4.0.5":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
+  dependencies:
+    defer-to-connect "^2.0.0"
 
 "@tmcw/togeojson@^4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@tmcw/togeojson/-/togeojson-4.3.0.tgz#8a9697b276d52ddc174d7fd559397f98d7c953af"
-  integrity sha512-naEKUYY7CbHQoj1R6e+DiEO6yrCwbX6NkLuy2AXkCD9zvsvWEY+dbY8mcD254GNc+07NROSjuTMocicn3Tigsg==
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/@tmcw/togeojson/-/togeojson-4.7.0.tgz#071d6d6d01f0aa86299cc98e3cdb102f1119241d"
+  integrity sha512-edAPymgIEIY/jrEmATYe56a46XHvPVm7SXhf29h7jSAUrRhLOIFIlbHPCsic/gGDSvWODTSioRFpXgou47ZLYg==
 
 "@turf/along@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/along/-/along-4.7.3.tgz#a4981f254cc7f0aa3713bee2e755fef3506b8518"
-  integrity sha1-pJgfJUzH8Ko3E77i51X+81BrhRg=
+  integrity sha512-LfP8wVb2xkG1tAI28VvvU8/OO7t5zbJVb5BbWydVhrwpvOBctaG8dIhtiphEPiMp5L4rTIX5jrLsPHle8Z8k2Q==
   dependencies:
     "@turf/bearing" "^4.7.3"
     "@turf/destination" "^4.7.3"
@@ -215,7 +240,7 @@
 "@turf/area@^3.13.0", "@turf/area@^3.7.0":
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/@turf/area/-/area-3.14.0.tgz#f3197ed4e9710d02cd8bbd551b25c476fe47e89b"
-  integrity sha1-8xl+1OlxDQLNi71VGyXEdv5H6Js=
+  integrity sha512-AwXi1+udChyKKZ7MDUUqtBd1fkVxVPQBx/zstZWZ108RkrNCfudHzOD9lEAKvjk67s11JjX/9Mgv1gkza8mdMw==
   dependencies:
     "@mapbox/geojson-area" "^0.2.2"
     "@turf/meta" "^3.14.0"
@@ -223,7 +248,7 @@
 "@turf/area@^4.4.0", "@turf/area@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/area/-/area-4.7.3.tgz#5cc45b5a524e98e1c171e7190709c669ca699305"
-  integrity sha1-XMRbWlJOmOHBcecZBwnGacppkwU=
+  integrity sha512-UnfWEuLeARBPmtkwxSVzZpgavMRdvbUV1BmHIzaN9x53qdENdv2frBJ0n0Qb4njyDMvABDUlMK83n4xDC4lHwQ==
   dependencies:
     "@mapbox/geojson-area" "^0.2.2"
     "@turf/meta" "^4.7.3"
@@ -231,7 +256,7 @@
 "@turf/bbox-clip@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/bbox-clip/-/bbox-clip-4.7.3.tgz#ba689c80a4cc38b2ec539d6de9a831087f450c09"
-  integrity sha1-umicgKTMOLLsU51t6agxCH9FDAk=
+  integrity sha512-XFxZSYvb5U8V/BUyH4wBZM4ZfEJSy0R726DR7sfgzkH497hvcjrMQJsqIOrcYpuIV7mP0wCJ6Q9XWsq3B2MTIQ==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -240,56 +265,56 @@
 "@turf/bbox-polygon@^4.4.0", "@turf/bbox-polygon@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/bbox-polygon/-/bbox-polygon-4.7.3.tgz#358890fd1f1a6cad9a9cb50799e37325fb88017a"
-  integrity sha1-NYiQ/R8abK2anLUHmeNzJfuIAXo=
+  integrity sha512-hJgq4ao67XR+5hLY23f/Eg5Urtnwa5vpBjwLa7lBfpP/FoGvWZE3uiRBECKFH9AMX2AkhMaqueVu2vjU5duZNQ==
   dependencies:
     "@turf/helpers" "^4.7.3"
 
 "@turf/bbox@4.7.1":
   version "4.7.1"
   resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-4.7.1.tgz#c2f05ec2bec10b9a3b4e045400aafab35b2f4cff"
-  integrity sha1-wvBewr7BC5o7TgRUAKr6s1svTP8=
+  integrity sha512-IJcqoRSSCs0XqWDPhnRVDoh/N9fE1Lhfdxz0NjXcXu8zTZnlOokoW50rWybOsWytdMKGv1MdT6la9H/CAW3xYQ==
   dependencies:
     "@turf/meta" "4.7.1"
 
 "@turf/bbox@^3.14.0":
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-3.14.0.tgz#cee5f396dde78aca9cede05e1122db18bc504635"
-  integrity sha1-zuXzlt3nisqc7eBeESLbGLxQRjU=
+  integrity sha512-INE3pLLnPt0J3z9vh18drKU/zBnfA26gQw94AdQDlpgv78mOs1qBMcnymhuxWgtAwLLXVhIPp2/GfiZsueseDA==
   dependencies:
     "@turf/meta" "^3.14.0"
 
 "@turf/bbox@^4.4.0", "@turf/bbox@^4.7.1", "@turf/bbox@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-4.7.3.tgz#e3ad4f10a7e9b41b522880d33083198199059067"
-  integrity sha1-461PEKfptBtSKIDTMIMZgZkFkGc=
+  integrity sha512-78lSzSQuLHq0363sVlmkX9uxBejeWGyZhQBAh7oc1ucnsYsem1m4ynjDXG8/hKP4nG/yUFWPdV9xklezKdvzKw==
   dependencies:
     "@turf/meta" "^4.7.3"
 
 "@turf/bearing@^4.4.0", "@turf/bearing@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/bearing/-/bearing-4.7.3.tgz#efd1a8a5c8ca0cdbecbcc02172c41ed216dff8f9"
-  integrity sha1-79GopcjKDNvsvMAhcsQe0hbf+Pk=
+  integrity sha512-VI3QsVFdfiZwZX3V6rDERXsY8BcYq7RuDUi7YoX8CKxXDcwkoFZqjoSCzKUO7wMpXwI8QIN/phBwqZfZZwH2Nw==
   dependencies:
     "@turf/invariant" "^4.7.3"
 
 "@turf/bezier@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/bezier/-/bezier-4.7.3.tgz#34bdd8e96f22726aad1f35683173882cf616be48"
-  integrity sha1-NL3Y6W8icmqtHzVoMXOILPYWvkg=
+  integrity sha512-t7wO3BeYRkMqM0nfweUzvFEs/JXpGdjsMIKPDMP5Rhohd5ZETMlthGels6Fo8KyC7OTm+0PQcnu67WLErjHsIA==
   dependencies:
     "@turf/helpers" "^4.7.3"
 
 "@turf/boolean-clockwise@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/boolean-clockwise/-/boolean-clockwise-4.7.3.tgz#0627916b1c43e06e00ed2c8117b20cfa6fbf7014"
-  integrity sha1-BieRaxxD4G4A7SyBF7IM+m+/cBQ=
+  integrity sha512-MOTTaHq5jFtdg9vDEQ7kr24ycbb8x2F/ERM5n/AQXzqByEv7LihODIW2NZg+qqqJcl3qltah72l71rFCkWOYtg==
   dependencies:
     "@turf/invariant" "^4.7.3"
 
 "@turf/boolean-overlap@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/boolean-overlap/-/boolean-overlap-4.7.3.tgz#8f8a5168d37ace5158cff6f4b0c234dd376c1b48"
-  integrity sha1-j4pRaNN6zlFYz/b0sMI03TdsG0g=
+  integrity sha512-iO4vhx1SwKjMgdppkXzOsksRe8MkjJJs8HwTGWuuoUMW02JrrGZfX7KZ6K+Myg6Tn9xD6LOCw9mOvr2zGc0BAw==
   dependencies:
     "@turf/invariant" "^4.7.3"
     "@turf/line-intersect" "^4.7.3"
@@ -300,14 +325,14 @@
 "@turf/boolean-point-on-line@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/boolean-point-on-line/-/boolean-point-on-line-4.7.3.tgz#68ee97b70bc6255f67cd1e51a45658411bcb9799"
-  integrity sha1-aO6XtwvGJV9nzR5RpFZYQRvLl5k=
+  integrity sha512-xQgPrrzXGq7rK4pCJvvoWxwSBc3b66WTu7rML0U2WBNMIzmkbqFOo+u/dxKgLMzQgSdfOkPI0i1fXPHscr6HJg==
   dependencies:
     "@turf/invariant" "^4.7.3"
 
 "@turf/buffer@^4.4.0":
   version "4.7.4"
   resolved "https://registry.yarnpkg.com/@turf/buffer/-/buffer-4.7.4.tgz#eaf0747051a8c3242db2783d9832421ac2ee3fbb"
-  integrity sha1-6vB0cFGowyQtsng9mDJCGsLuP7s=
+  integrity sha512-yUG+trJa5Xki5RTZkbg0+ce7FJMb34jtzxoSz0n0k7oozeUCsAO8ftaVUiiV/UQy4JlYbs8CsCnHTOitHBNuyA==
   dependencies:
     "@turf/bbox" "^4.7.1"
     "@turf/center" "4.7.1"
@@ -320,7 +345,7 @@
 "@turf/center-of-mass@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/center-of-mass/-/center-of-mass-4.7.3.tgz#67a665c704e334bcff8e2897755fbc2bb327bc9b"
-  integrity sha1-Z6ZlxwTjNLz/jiiXdV+8K7MnvJs=
+  integrity sha512-rpHKJCezYOCSgMnqRJZF8hpBgWZJalTobpqeurCqG+GQwR9OTyAk5wYl1Z1XMtr+75Mgmu2CTZVjl4klwoZADw==
   dependencies:
     "@turf/centroid" "^4.7.3"
     "@turf/convex" "^4.7.3"
@@ -332,7 +357,7 @@
 "@turf/center@4.7.1":
   version "4.7.1"
   resolved "https://registry.yarnpkg.com/@turf/center/-/center-4.7.1.tgz#5c66c56144f07c35e26292ca61b4105b1b53a8d2"
-  integrity sha1-XGbFYUTwfDXiYpLKYbQQWxtTqNI=
+  integrity sha512-i4F0tLp0QIz7Lmqvaa8Hu+SVQVX6n7f9dFsdFp8iE3JrYbvbu0w3UYHnrpxx9vUEEAVoPYeu97M7NpMxPgS4kA==
   dependencies:
     "@turf/bbox" "4.7.1"
     "@turf/helpers" "4.7.1"
@@ -340,7 +365,7 @@
 "@turf/center@^4.4.0", "@turf/center@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/center/-/center-4.7.3.tgz#744e5c652a7b1bbd0e1ee3f05e30dde43e2a35a4"
-  integrity sha1-dE5cZSp7G70OHuPwXjDd5D4qNaQ=
+  integrity sha512-V17vfzG48GhCRgTVflODxiezGISUAWcmE/HzsTEp6B/fU0ZqhNlEXQTYr0qD46g+gn0BPQu4YNND9azfiBXBZQ==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -348,7 +373,7 @@
 "@turf/centroid@^4.4.0", "@turf/centroid@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/centroid/-/centroid-4.7.3.tgz#205a7675719b0c8e175bb7565c5d6fe267d88175"
-  integrity sha1-IFp2dXGbDI4XW7dWXF1v4mfYgXU=
+  integrity sha512-TuCq6tZOI+jfwuVtX/2AMycVkM2ghYEwan9SszVlOA4KZxSZVopk8IiSqu3B9Tsf15E0UGvVc/awIdUzLJhP5w==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/meta" "^4.7.3"
@@ -356,7 +381,7 @@
 "@turf/circle@^4.4.0", "@turf/circle@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/circle/-/circle-4.7.3.tgz#e8f996ff87b0ca8e3e6b74b60f6ab5daf9086713"
-  integrity sha1-6PmW/4ewyo4+a3S2D2q12vkIZxM=
+  integrity sha512-6LpuccDa2zPm+/BnDrm4w4/G82O1F9YXAXoYDAMOWXZPNeN9zFSsUEdhdpqNcWuOYd1/tipTs9iXmNR30/H4KA==
   dependencies:
     "@turf/destination" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -364,7 +389,7 @@
 "@turf/clean-coords@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/clean-coords/-/clean-coords-4.7.3.tgz#bc3e6523afe42dc88dba5da1a713072a5cd6da0f"
-  integrity sha1-vD5lI6/kLciNul2hpxMHKlzW2g8=
+  integrity sha512-si30bdVGdsMaNGMcsKmmBO8DBM9Nd9BIoR8Udz62W/Ze0MbXkZmb7S7oyXQ28EVbnIbE7sKlkTySIdizkD3K5Q==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -372,12 +397,12 @@
 "@turf/clone@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/clone/-/clone-4.7.3.tgz#6e507be4d648fa62c5e6ce926f7e83a22f53ae69"
-  integrity sha1-blB75NZI+mLF5s6Sb36Doi9Trmk=
+  integrity sha512-0iT6+CfOF82KTsJ+Y1AkXkVDANkhWUuA4UjRQina9zUtiTXq+Y1teEWt8PBMCwx+Fgh+zw8aInsa6tLCGGaJMg==
 
 "@turf/collect@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/collect/-/collect-4.7.3.tgz#c92b5921f8822983cbceaca3e1bd5bee73aae9ff"
-  integrity sha1-yStZIfiCKYPLzqyj4b1b7nOq6f8=
+  integrity sha512-7P+BybLopItPGcuCwXrwJmqRKOdhQ43MyMLaXnjmbHKFx3d01Y2HIhLBrujmSaEdNcmLpi7sGH6G1MJNimdzSg==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/inside" "^4.7.3"
@@ -386,14 +411,14 @@
 "@turf/combine@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/combine/-/combine-4.7.3.tgz#95ad31253e13c86fc613cb4ff7683adb50c32e06"
-  integrity sha1-la0xJT4TyG/GE8tP92g621DDLgY=
+  integrity sha512-80HWtNEC6uXO2T7c4Hz3LHcO0rLTxz8UbKVOlKnAvJLX/F0bVzhyqYdmgagiWz9sazZgDhDEc87Dk3WHbS2l8g==
   dependencies:
     "@turf/meta" "^4.7.3"
 
 "@turf/concave@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/concave/-/concave-4.7.3.tgz#0f80a12a142bc407ef8632c41820852003404d9e"
-  integrity sha1-D4ChKhQrxAfvhjLEGCCFIANATZ4=
+  integrity sha512-mhwn8FJHGcYM5PuhYQHQL6KYD01ekN70jpCjDbi2/wE1Bmda8TGlUmIuq8I9RvF+S+5e99J2k0uNDU5wb0l63Q==
   dependencies:
     "@turf/distance" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -404,7 +429,7 @@
 "@turf/convex@^4.4.0", "@turf/convex@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/convex/-/convex-4.7.3.tgz#1e06093d8453fa59c17d6755cb5ec96f4687363a"
-  integrity sha1-HgYJPYRT+lnBfWdVy17Jb0aHNjo=
+  integrity sha512-zNgwxM1CWbyMmIHDJ/gCnEXBLoAnU8LurtHAwVAdeFI3lYBnnNcpSFuPbBv8Y5d3nN1/ZG7zfs3H2vIonRHXww==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/meta" "^4.7.3"
@@ -413,7 +438,7 @@
 "@turf/destination@^4.4.0", "@turf/destination@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/destination/-/destination-4.7.3.tgz#f1ea3bb3705cf52fed135a7917d49336e47b8d2e"
-  integrity sha1-8eo7s3Bc9S/tE1p5F9STNuR7jS4=
+  integrity sha512-nqihJgzsXXyoyLMgmxifefePAPKpaWR1haXvK3VhXCdv1svL4i2eD79oTz9+YQJSkJc1I83MZOOXVFyad7B/Nw==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -421,7 +446,7 @@
 "@turf/difference@^4.4.0":
   version "4.7.4"
   resolved "https://registry.yarnpkg.com/@turf/difference/-/difference-4.7.4.tgz#9286190d7dd151dda57bae39fe92e4b88bc3361a"
-  integrity sha1-koYZDX3RUd2le645/pLkuIvDNho=
+  integrity sha512-/PC9VNJ/zjDbM9wWGWhNByoseMP1qDevGaXn4H55s/6jt+3Kbljb66HIxR7NysjZrlkePVI40ZES38qscQzz1w==
   dependencies:
     "@turf/area" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -432,7 +457,7 @@
 "@turf/dissolve@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/dissolve/-/dissolve-4.7.3.tgz#36b70e68cf41d4bc3b4b86b952d402088f1a4170"
-  integrity sha1-NrcOaM9B1Lw7S4a5UtQCCI8aQXA=
+  integrity sha512-zf7KIFJYUhKwgpbhWa7hT6xbBc9SqmE6wraXlQZgntC8JgpzYSxe8eUt5nt16R/qK4qxkYC1RJUgSkeYG9p2Tw==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/boolean-overlap" "^4.7.3"
@@ -444,7 +469,7 @@
 "@turf/distance@^4.4.0", "@turf/distance@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/distance/-/distance-4.7.3.tgz#b5ab48a09a642706d65c39b919433d5d2cc571b1"
-  integrity sha1-tatIoJpkJwbWXDm5GUM9XSzFcbE=
+  integrity sha512-nluvFy7qjZFq4B6E+KAlKdwdg9fbgJMIe/5O7jveg56gcXZ5Bvgx3lFUxAY016+l907OeX9lIZCNr/Y96FMyEA==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -452,7 +477,7 @@
 "@turf/envelope@^4.3.0", "@turf/envelope@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/envelope/-/envelope-4.7.3.tgz#22642a6935e515866be075c88f03483a20c02096"
-  integrity sha1-ImQqaTXlFYZr4HXIjwNIOiDAIJY=
+  integrity sha512-xqWJSW4Eo2teEfJujl36vIVGTt5A/S1+yK+cmbBTYuGTOpwUIlrsolf3RYU3AXB1VWlptrT3DNZVBLd8o17DPA==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/bbox-polygon" "^4.7.3"
@@ -460,7 +485,7 @@
 "@turf/explode@^3.7.0":
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/@turf/explode/-/explode-3.14.0.tgz#f2cc1e46a39700d5602466ccd50f59a52341b92c"
-  integrity sha1-8sweRqOXANVgJGbM1Q9ZpSNBuSw=
+  integrity sha512-S7QvYBMAua4kmaelUF2ckfq/NGARq0B8RYhmvEeyq8SKA8ExJMNqjYbP6v7zDC7yRiK8tn89aNILw97xIc3bCw==
   dependencies:
     "@turf/helpers" "^3.13.0"
     "@turf/meta" "^3.14.0"
@@ -468,7 +493,7 @@
 "@turf/explode@^4.4.0", "@turf/explode@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/explode/-/explode-4.7.3.tgz#f7e2efb25aea03410cce1e9816584ba94fc91846"
-  integrity sha1-9+LvslrqA0EMzh6YFlhLqU/JGEY=
+  integrity sha512-7dTbk4MUoybTdL0kLa3zGq0yWIeUK8yQMO2mA7wwZvNj7NVAG70F4Q5+UH3fTIdheh5dvlgGFsJglNpcWNC+mA==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/meta" "^4.7.3"
@@ -476,7 +501,7 @@
 "@turf/flatten@^4.4.0", "@turf/flatten@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/flatten/-/flatten-4.7.3.tgz#7ea409fbc6fb4ee2f142834b4186d0f69da8350a"
-  integrity sha1-fqQJ+8b7TuLxQoNLQYbQ9p2oNQo=
+  integrity sha512-fBMei5B41U/yKY/+yCiSqt9buqTV5jZCjU/D2lyOfTiu6TYvNt/oaK53GUE7IJliAAjiaXjXUP+RGsIvDadCMA==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/meta" "^4.7.3"
@@ -484,41 +509,41 @@
 "@turf/flip@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/flip/-/flip-4.7.3.tgz#9d7c956facf6512111f104d43e167cb64f7cdc16"
-  integrity sha1-nXyVb6z2USER8QTUPhZ8tk983BY=
+  integrity sha512-CR8PhVhRMHcgTDkyTu9ems/XCA5UxpeDVgaPUFXjTNc1nF3BTxnfz9zHKFKBmIGrBcTOuNyLaGMmnMxbE9q+YA==
   dependencies:
     "@turf/meta" "^4.7.3"
 
 "@turf/great-circle@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/great-circle/-/great-circle-4.7.3.tgz#813255740abcf0cf2db9bfef2749b11604c06cd1"
-  integrity sha1-gTJVdAq88M8tub/vJ0mxFgTAbNE=
+  integrity sha512-y1aX0AcCjvS4IKEWPV/cKz22AjAASNHoOAYpCX8hQIudK2FCLpA35qucLYnAhjMPG5FiF8X9gKsl5VZseF9ZFA==
   dependencies:
     "@turf/invariant" "^4.7.3"
 
 "@turf/helpers@4.7.1":
   version "4.7.1"
   resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-4.7.1.tgz#12cecbfe22b16386338537dae3e3da83de2f3fac"
-  integrity sha1-Es7L/iKxY4YzhTfa4+Pag94vP6w=
+  integrity sha512-C1TGudzOyot+KiQFq20kaQJSPJZugRcvcYfLSNdwJYJw1glAlHY//2Ij542LXLK6/jzXTVVhdSNcPBvbw4sWAQ==
 
 "@turf/helpers@5.x", "@turf/helpers@^5.1.5":
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-5.1.5.tgz#153405227ab933d004a5bb9641a9ed999fcbe0cf"
-  integrity sha1-FTQFInq5M9AEpbuWQantmZ/L4M8=
+  integrity sha512-/lF+JR+qNDHZ8bF9d+Cp58nxtZWJ3sqFe6n3u3Vpj+/0cqkjk4nXKYBSY0azm+GIYB5mWKxUXvuP/m0ZnKj1bw==
 
 "@turf/helpers@^3.13.0", "@turf/helpers@^3.6.3":
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-3.13.0.tgz#d06078a1464cf56cdb7ea624ea1e13a71b88b806"
-  integrity sha1-0GB4oUZM9WzbfqYk6h4TpxuIuAY=
+  integrity sha512-iDtLM9XHGhQUN0hxLGAKJTmaNnM7ffxdAVVrIRQUREatb78ls9seqwnpM2JSFc8ZgFEapwRhHK8FRBH6zIbHkA==
 
 "@turf/helpers@^4.1.0", "@turf/helpers@^4.3.0", "@turf/helpers@^4.4.0", "@turf/helpers@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-4.7.3.tgz#bc312ac43cab3c532a483151c4c382c5649429e9"
-  integrity sha1-vDEqxDyrPFMqSDFRxMOCxWSUKek=
+  integrity sha512-hk5ANVazb80zK6tjJYAG76oCRTWMQo6SAFu5E1dVnlb2kT3FHLoPcOB9P11duwDafMwywz24KZ+FUorB5e728w==
 
 "@turf/hex-grid@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/hex-grid/-/hex-grid-4.7.3.tgz#6eacc4d153cf430777deae7a48698cfb27ae7ec6"
-  integrity sha1-bqzE0VPPQwd33q56SGmM+yeufsY=
+  integrity sha512-o10BzbwszM0MFtdl/9ClCxFZagHuoG6832DAukfO3l6HjBZtb16F8ojVvgdxXzlLE0qztykPi88GJJwUoAaJkQ==
   dependencies:
     "@turf/distance" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -526,7 +551,7 @@
 "@turf/idw@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/idw/-/idw-4.7.3.tgz#b8a9b2213265e00609ffbbf86a05af17523a3b25"
-  integrity sha1-uKmyITJl4AYJ/7v4agWvF1I6OyU=
+  integrity sha512-+Z2wEf/agYdYNdte7IefkWuCoOnHP7EAkzCjFrm6UxBrycuh7Xd0S3SBu+5rWc1CNdLaWstOu7xeVyeskqw2/w==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/centroid" "^4.7.3"
@@ -536,21 +561,21 @@
 "@turf/inside@^3.14.0", "@turf/inside@^3.7.0":
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/@turf/inside/-/inside-3.14.0.tgz#d6b6af55882cbdb8f9a558dca98689c67bd3c590"
-  integrity sha1-1ravVYgsvbj5pVjcqYaJxnvTxZA=
+  integrity sha512-zIm5T08WnHqJs2gt7zqNCeA2J1vK1+r8oRtrqkeMpBv4cUJ8xBo8cyRU1MzTdIgkVXlQaGDdlNCF9ZIQYicQ+A==
   dependencies:
     "@turf/invariant" "^3.13.0"
 
 "@turf/inside@^4.3.0", "@turf/inside@^4.4.0", "@turf/inside@^4.5.2", "@turf/inside@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/inside/-/inside-4.7.3.tgz#e4a84969f2886891b343b11b83fda3095fba542c"
-  integrity sha1-5KhJafKIaJGzQ7Ebg/2jCV+6VCw=
+  integrity sha512-V/gMvWxoOCMNEz1KUcFVWDS78jvcNtVxNAf2oc3jz8NYs+DUZymkKjHiLkM9NPQ8fjXwsAsFq12DYgTp+HnDig==
   dependencies:
     "@turf/invariant" "^4.7.3"
 
 "@turf/intersect@^4.4.0":
   version "4.7.4"
   resolved "https://registry.yarnpkg.com/@turf/intersect/-/intersect-4.7.4.tgz#d95d5d69fbf132f834eb772251a1da2aae3f33a3"
-  integrity sha1-2V1dafvxMvg063ciUaHaKq4/M6M=
+  integrity sha512-QSJjkfaBrvOehz1j9YuqDKIFUpK7Us6+GGrFdwLaeFpv2acdTRGX1V2b9mG7zQlFJrYbJNUelMTthtw/MOULjQ==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/truncate" "^4.7.3"
@@ -559,24 +584,24 @@
 "@turf/invariant@5.x":
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-5.2.0.tgz#f0150ff7290b38577b73d088b7932c1ee0aa90a7"
-  integrity sha1-8BUP9ykLOFd7c9CIt5MsHuCqkKc=
+  integrity sha512-28RCBGvCYsajVkw2EydpzLdcYyhSA77LovuOvgCJplJWaNVyJYH6BOR3HR9w50MEkPqb/Vc/jdo6I6ermlRtQA==
   dependencies:
     "@turf/helpers" "^5.1.5"
 
 "@turf/invariant@^3.13.0":
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-3.13.0.tgz#89243308cd563206e81e5c6162e0d22f61822f90"
-  integrity sha1-iSQzCM1WMgboHlxhYuDSL2GCL5A=
+  integrity sha512-tqqatJteAlV4CPdAbAAo8DlBFJzlu5cI747/mO8Rfpd70vDvcFzm65RIp/fxvdEP5sSfdc9qsQS4DU2z0bURIA==
 
 "@turf/invariant@^4.1.0", "@turf/invariant@^4.3.0", "@turf/invariant@^4.4.0", "@turf/invariant@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-4.7.3.tgz#538f367d23c113fc849d70c9a524b8563874601d"
-  integrity sha1-U482fSPBE/yEnXDJpSS4Vjh0YB0=
+  integrity sha512-MtlIn9aPC4gZsflLEnfBl/o/SJjZU/yuvj+fo9qRXUOI8wBiKaUcZIT4x1jdLW0NGvU7wMPWJSFJanLCQ9eU1w==
 
 "@turf/isobands@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/isobands/-/isobands-4.7.3.tgz#482efede3ccb428c5529527090fcf8b74791af14"
-  integrity sha1-SC7+3jzLQoxVKVJwkPz4t0eRrxQ=
+  integrity sha512-/pmB3hr3UvCNw8sop5vg9OR3BxnxYUb6iH9TT5mdgq0+gFolnef7Ar0g5faiLP2pAXsBrNY8v5J2MEESXpqEZA==
   dependencies:
     "@turf/area" "^3.7.0"
     "@turf/bbox" "^3.14.0"
@@ -590,7 +615,7 @@
 "@turf/isolines@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/isolines/-/isolines-4.7.3.tgz#306c5b5c7df24632776574725177ef73e3342bb5"
-  integrity sha1-MGxbXH3yRjJ3ZXRyUXfvc+M0K7U=
+  integrity sha512-sMu78BbHZBKQXDaxc1T40WwCenDD7CKwowaTPloImKPB0i20flqF5B3DPxznGC/dbtqzVT5RGa2xUyro8AOkXw==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -602,14 +627,14 @@
 "@turf/kinks@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/kinks/-/kinks-4.7.3.tgz#64e1851f8dd16ed212eb2b27bfd43802fe403565"
-  integrity sha1-ZOGFH43RbtIS6ysnv9Q4Av5ANWU=
+  integrity sha512-YyU1qOGZGAPCo4JW1JdLfFuU8nHQ2nMItJE0rBp2uvoljkVUfUV4gH7EbTQR9sJEYaHv3pY4Ehope4IPQ3u67w==
   dependencies:
     "@turf/helpers" "^4.7.3"
 
 "@turf/line-arc@^4.4.0", "@turf/line-arc@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/line-arc/-/line-arc-4.7.3.tgz#32d6c2331bf63bcacf63c17fc619baa729fdce3f"
-  integrity sha1-MtbCMxv2O8rPY8F/xhm6pyn9zj8=
+  integrity sha512-4DYTPoH/v8v2Ma9IXipoAfCbWiSwPy0mA8TNVYiGuD26I8hbVxO8j3CWdT+FQtNOq/9Iwxfj/xYUzC1NsCSOhA==
   dependencies:
     "@turf/circle" "^4.7.3"
     "@turf/destination" "^4.7.3"
@@ -618,7 +643,7 @@
 "@turf/line-chunk@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/line-chunk/-/line-chunk-4.7.3.tgz#1d914f350321da07756c0125fb5112eb282a78af"
-  integrity sha1-HZFPNQMh2gd1bAEl+1ES6ygqeK8=
+  integrity sha512-WZDK6wt//PpumQ7VMoKcrdhDerx51/B+qtbgDwLwVMrx+d5RhXiONyghL+mnkdtq6cRzUoXkNgaB3kqk3L0Xow==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/line-distance" "^4.7.3"
@@ -628,7 +653,7 @@
 "@turf/line-distance@^4.4.0", "@turf/line-distance@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/line-distance/-/line-distance-4.7.3.tgz#00a33000e088ee5e3a8d92b7b96bb332af373006"
-  integrity sha1-AKMwAOCI7l46jZK3uWuzMq83MAY=
+  integrity sha512-U6sFReqpMJq/LhOoDna4w1Vs2gliJUhFa1g94WrZrVz7l4IHldy7Q0Va0CyQ00qN5n3f09/vf4F+q2+ThHbL4g==
   dependencies:
     "@turf/distance" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -637,7 +662,7 @@
 "@turf/line-intersect@^4.4.0", "@turf/line-intersect@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/line-intersect/-/line-intersect-4.7.3.tgz#072b3738637f7a0454aac708f995a3a29764b056"
-  integrity sha1-Bys3OGN/egRUqscI+ZWjopdksFY=
+  integrity sha512-P4ahMpPq9mfqJGNdFYS45848708jhW8PM2w1qdbwKrTn5WiT4L3+OHzSQoQAApQ/f5S4Ge4TncfsldGN4HYZrg==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -648,7 +673,7 @@
 "@turf/line-offset@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/line-offset/-/line-offset-4.7.3.tgz#a3e24d1c1d990cbfa32b9d9f3cd16446a7ec08d5"
-  integrity sha1-o+JNHB2ZDL+jK52fPNFkRqfsCNU=
+  integrity sha512-A+wbdRMsuNYmLkRqQMKyTzPGnRTU5mdeuOdxXp3oq1QkFHKVVfjjQeFONWC0oYB9G2PCuL+4U4mWyNV90f/kvQ==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -657,7 +682,7 @@
 "@turf/line-overlap@^4.4.0", "@turf/line-overlap@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/line-overlap/-/line-overlap-4.7.3.tgz#5be57ad366f629937e208f311b61efee3995248b"
-  integrity sha1-W+V602b2KZN+II8xG2Hv7jmVJIs=
+  integrity sha512-3kp+3PurY9SdZl/NGDYA1l2I9DDoYljqDFygyWjGf6hKr5fHVvNX+Op84W8gKVpUM1gMS6RaPjaI8xzY3MeXLg==
   dependencies:
     "@turf/boolean-point-on-line" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -671,7 +696,7 @@
 "@turf/line-segment@^4.4.0", "@turf/line-segment@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/line-segment/-/line-segment-4.7.3.tgz#771f71fa653d8e6bbc5a8d892283163e94b34d7a"
-  integrity sha1-dx9x+mU9jmu8Wo2JIoMWPpSzTXo=
+  integrity sha512-zPbm5nugKpGfpfMhmf2C+4WB62F2E2IsWKPnz4gX+t9itWV+EqNdUPi74zArkScy4m6HRsPnIzohmz++6mf/oQ==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -680,7 +705,7 @@
 "@turf/line-slice-along@^4.4.0", "@turf/line-slice-along@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/line-slice-along/-/line-slice-along-4.7.3.tgz#df051d10cbbb29851ee4b7d7e190124b7e0d62cb"
-  integrity sha1-3wUdEMu7KYUe5LfX4ZASS34NYss=
+  integrity sha512-t71zAb3ZldhewfDCXawyOMqB+8nhC3hkID/o5AAx8d2ub987EJExO+wfT3K+oV9yc+87SDEKVRJO2vsio/hWGg==
   dependencies:
     "@turf/bearing" "^4.7.3"
     "@turf/destination" "^4.7.3"
@@ -690,7 +715,7 @@
 "@turf/line-slice@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/line-slice/-/line-slice-4.7.3.tgz#fa546d8c717f772ea7d6afc9964965aa45e18eef"
-  integrity sha1-+lRtjHF/dy6n1q/JlkllqkXhju8=
+  integrity sha512-UW/jw6Kd4ARwjQcob0suOEyrhFN7zFgVfKn7UtOmzbKviXTFqRUp8vduIGyyRh7FgFHIL9OP0g2qUsCUCVqVEw==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/point-on-line" "^4.7.3"
@@ -698,7 +723,7 @@
 "@turf/line-split@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/line-split/-/line-split-4.7.3.tgz#22d81162da37861b7d22859073adef22f8af53db"
-  integrity sha1-ItgRYto3hht9IoWQc63vIvivU9s=
+  integrity sha512-U3ICYQsjipdRTfr36IVnlKVohCuHAMOrW6B3n6Ab+qY/IvObFvxi0ngI9ddAk5hD5tMtJ5ysZ96aenKThLmS+g==
   dependencies:
     "@turf/flatten" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -713,7 +738,7 @@
 "@turf/linestring-to-polygon@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/linestring-to-polygon/-/linestring-to-polygon-4.7.3.tgz#f45fef8c544d8b288f5ba58c2bae349a18fb597f"
-  integrity sha1-9F/vjFRNiyiPW6WMK640mhj7WX8=
+  integrity sha512-RIvf9FOu7rUX19UsoCItamYDkO9k+sk8PrShfMF6ph8ecyT0qjX6Ec5Zoe0TTMuNNKfAbzdO1NEWgVU8HcopUQ==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -722,7 +747,7 @@
 "@turf/mask@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/mask/-/mask-4.7.3.tgz#53d0b4c8114d0be9f8d496ddc048ee17ad639de3"
-  integrity sha1-U9C0yBFNC+n41JbdwEjuF61jneM=
+  integrity sha512-fIzGdBW8JCHLadjd8GGwd+CDlBaEAje1f4rFwyixPdJ7i6L/adNdxQjLT70nG1q9uinl55XSG40oGglzdQlzPg==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -733,29 +758,29 @@
 "@turf/meta@4.7.1":
   version "4.7.1"
   resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-4.7.1.tgz#53a55281ae08a5fa2f414d9ba50a951d38e86ab5"
-  integrity sha1-U6VSga4IpfovQU2bpQqVHTjoarU=
+  integrity sha512-S/+ixW2FQFDZLNWyrnlfYtSQZUZO3DhAaFw0nxd1XGMQ2q2z2mnscTncF7tRWW1OIVhkjXJwb80VADzq+EAIDg==
 
 "@turf/meta@5.x":
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-5.2.0.tgz#3b1ad485ee0c3b0b1775132a32c384d53e4ba53d"
-  integrity sha1-OxrUhe4MOwsXdRMqMsOE1T5LpT0=
+  integrity sha512-ZjQ3Ii62X9FjnK4hhdsbT+64AYRpaI8XMBMcyftEOGSmPMUVnkbvuv3C9geuElAXfQU7Zk1oWGOcrGOD9zr78Q==
   dependencies:
     "@turf/helpers" "^5.1.5"
 
 "@turf/meta@^3.14.0", "@turf/meta@^3.7.5":
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-3.14.0.tgz#8d3050c1a0f44bf406a633b6bd28c510f7bcee27"
-  integrity sha1-jTBQwaD0S/QGpjO2vSjFEPe87ic=
+  integrity sha512-OtXqLQuR9hlQ/HkAF/OdzRea7E0eZK1ay8y8CBXkoO2R6v34CsDrWYLMSo0ZzMsaQDpKo76NPP2GGo+PyG1cSg==
 
 "@turf/meta@^4.1.0", "@turf/meta@^4.3.0", "@turf/meta@^4.4.0", "@turf/meta@^4.6.0", "@turf/meta@^4.7.3":
   version "4.7.4"
   resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-4.7.4.tgz#6de2f1e9890b8f64b669e4b47c09b20893063977"
-  integrity sha1-beLx6YkLj2S2aeS0fAmyCJMGOXc=
+  integrity sha512-cvwz4EI9BjrgRHxmJ3Z3HKxq6k/fj/V95kwNZ8uWNLncCvrb7x1jUBDkQUo1tShnYdZ8eBgA+a2bvJmAM+MJ0A==
 
 "@turf/midpoint@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/midpoint/-/midpoint-4.7.3.tgz#9b12cd5c7c5d15fce3d6b00b2138982d497c1426"
-  integrity sha1-mxLNXHxdFfzj1rALITiYLUl8FCY=
+  integrity sha512-549hf0146R0LWSfY1YXuYNw3p0P9UttxXz3Xho+ECkcHkYToGiM3xfLa8USCle8/Ko1VN+IXaQ5jiVrPI+2seQ==
   dependencies:
     "@turf/bearing" "^4.7.3"
     "@turf/destination" "^4.7.3"
@@ -764,21 +789,21 @@
 "@turf/nearest@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/nearest/-/nearest-4.7.3.tgz#fce14ae01985fec6b3438a1f9c0a474cf6e02ae2"
-  integrity sha1-/OFK4BmF/sazQ4ofnApHTPbgKuI=
+  integrity sha512-HJlzoWmhNeTSZk/lQaSJKcWxWu0BmUlW4I7xEVSIYbP2WbR/cL2yIM3JbCZAaELs35l9T4d8Z0r5+QilFR0Qew==
   dependencies:
     "@turf/distance" "^4.7.3"
 
 "@turf/planepoint@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/planepoint/-/planepoint-4.7.3.tgz#d055dcc21eaf1c6ed99bf9987157f73ba0a1da7f"
-  integrity sha1-0FXcwh6vHG7Zm/mYcVf3O6Ch2n8=
+  integrity sha512-9swirMuUeU+bEGgQZJFwOVqpEZBylX1+8CDxhHgBB5jxZtMjY/9FZKlgPtw9fkAaKievDvddlwFtang9NH7mjA==
   dependencies:
     "@turf/invariant" "^4.7.3"
 
 "@turf/point-grid@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/point-grid/-/point-grid-4.7.3.tgz#33bc3c921b521897e282c0b882e106508052ed7d"
-  integrity sha1-M7w8khtSGJfigsC4guEGUIBS7X0=
+  integrity sha512-2b90Zr3Ra5XYZ8jPLasPbMsaR1h0iKJRcyLI1c4vyxo+vMrDidaBwFR16xcfWMZQLV7TSKWVueSaS1rzHb1z2A==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/distance" "^4.7.3"
@@ -789,7 +814,7 @@
 "@turf/point-on-line@^4.4.0", "@turf/point-on-line@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/point-on-line/-/point-on-line-4.7.3.tgz#944a1e7b2c4375f488e83ce55eab35454e9ab7b7"
-  integrity sha1-lEoeeyxDdfSI6DzlXqs1RU6at7c=
+  integrity sha512-OUpbBpySsgsO6LAjFi2vEjV//6zD2nSSMZBp1lW/I6Wt1P9N9hHgCIqIL1/n5se7yMQc/U3+43YbT5ueSbExpw==
   dependencies:
     "@turf/bearing" "^4.7.3"
     "@turf/destination" "^4.7.3"
@@ -802,7 +827,7 @@
 "@turf/point-on-surface@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/point-on-surface/-/point-on-surface-4.7.3.tgz#25ec360bec7f9fa612d705808cf0310d72c2be5f"
-  integrity sha1-Jew2C+x/n6YS1wWAjPAxDXLCvl8=
+  integrity sha512-a+9zaU/xDLXm7gqe9oR1JJLLMdvgZoQjQj9zTdNjbI4378xaxmlwrHvOtRnFtXDj+43NLQFus9KmcEdWtreXWA==
   dependencies:
     "@turf/center" "^4.7.3"
     "@turf/distance" "^4.7.3"
@@ -813,7 +838,7 @@
 "@turf/polygon-tangents@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/polygon-tangents/-/polygon-tangents-4.7.3.tgz#9ddfac9b9b3840f4c43be65d69321f1cd47a7b24"
-  integrity sha1-nd+sm5s4QPTEO+ZdaTIfHNR6eyQ=
+  integrity sha512-3zvc/mwl+z2z/fOQY2Gb6oZU0hM8k6gm+Dg0lMwXBzACDcJELYIznecwMeWJW1gW98E6h0dQJWAcEZtlHlAR0g==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -821,7 +846,7 @@
 "@turf/polygon-to-linestring@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/polygon-to-linestring/-/polygon-to-linestring-4.7.3.tgz#ab867c0d39581bc411c49e0263fd18b4674171a1"
-  integrity sha1-q4Z8DTlYG8QRxJ4CY/0YtGdBcaE=
+  integrity sha512-hMYYBk14jvEeQOroyvcul/FFRxZpShj4EIckEm2Ub2YFaMFY5BCgAYlq6+HzCzVf9pqV4NAB3ziF+BJsNuK8Hw==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -829,14 +854,14 @@
 "@turf/polygonize@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/polygonize/-/polygonize-4.7.3.tgz#0f88ddacd71c6f2c0b96c69ce67555437ea195df"
-  integrity sha1-D4jdrNccbywLlsac5nVVQ36hld8=
+  integrity sha512-0d5cTIcRZ8cN1O+TAa0tzuZp8VWcPpMuPYH0FXOc8b9K+bUghmNbrvCKTeVGTkBIeZqXyUerbmjWAtX/mRf4dQ==
   dependencies:
     polygonize "1.0.1"
 
 "@turf/projection@^4.7.1":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/projection/-/projection-4.7.3.tgz#c3e45745d89371ee720e43add56f08850e90694a"
-  integrity sha1-w+RXRdiTce5yDkOt1W8IhQ6QaUo=
+  integrity sha512-f2s0JOmOLUoydLrighEZLjQ9bTIWTEjZvSymlj9Q7xp0uXqtOesT5D0DW1EIdC0L6ZdqzJhUB0BqGgePSgOIFQ==
   dependencies:
     "@turf/clone" "^4.7.3"
     "@turf/meta" "^4.7.3"
@@ -844,14 +869,14 @@
 "@turf/random@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/random/-/random-4.7.3.tgz#0a8a3b84a1f15b8916d4dce43566beb2e2bda522"
-  integrity sha1-Coo7hKHxW4kW1NzkNWa+suK9pSI=
+  integrity sha512-N7317cwwr5DAgCvE4+YwNg/UtKG1rok20I28NSspnRcj2NEDVJGFzf/q+f5QqzZjinvrNVRcr54K/1siJmtsYg==
   dependencies:
     geojson-random "^0.2.2"
 
 "@turf/rewind@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/rewind/-/rewind-4.7.3.tgz#69899fc3ec53d611b55051fa00c51508d903c5bf"
-  integrity sha1-aYmfw+xT1hG1UFH6AMUVCNkDxb8=
+  integrity sha512-w5y2BN542T0zIUYnyTMVat4uHM26FzQbN90SdWEFLNF8Y3QwS3USmp1p1Yhr+H8GgoEnDlGRr6gnsoPxYYRbnw==
   dependencies:
     "@turf/boolean-clockwise" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -861,7 +886,7 @@
 "@turf/rhumb-bearing@^4.4.0", "@turf/rhumb-bearing@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/rhumb-bearing/-/rhumb-bearing-4.7.3.tgz#db1821b62706fb403adbf9413cc5e56b79006146"
-  integrity sha1-2xghticG+0A62/lBPMXla3kAYUY=
+  integrity sha512-v21ua0t0GbdZ77qtXJMI87igkEqUCnUKSCA4ZYrPFzIvECmAcf01zOgDCyOT2wHkf5aOzj1I25K9VfhbLq8FDw==
   dependencies:
     "@turf/invariant" "^4.7.3"
     geodesy "1.1.2"
@@ -869,7 +894,7 @@
 "@turf/rhumb-destination@^4.4.0", "@turf/rhumb-destination@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/rhumb-destination/-/rhumb-destination-4.7.3.tgz#1b74188c282a790d302e7d8447a077a5e1242aee"
-  integrity sha1-G3QYjCgqeQ0wLn2ER6B3peEkKu4=
+  integrity sha512-Hk8MBjZMf1qgmFWlmsPKItDWyXsxT/uesCapY7BofCM7b3kvmRuNaw4yE0YIfzOlOZfHfVHpBPpBOr/loeO0BA==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -878,7 +903,7 @@
 "@turf/rhumb-distance@^4.4.0", "@turf/rhumb-distance@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/rhumb-distance/-/rhumb-distance-4.7.3.tgz#30eebc6b785502bd8e08548069712c9709ed22d4"
-  integrity sha1-MO68a3hVAr2OCFSAaXEslwntItQ=
+  integrity sha512-1ohJzJU8lz/QpxvwwLPta0zu6HMrWcCqgvrEy4LTf0IFfAHR4QJOKo9WBCG29XYB5Vks4WueyJi9wES/d9QcdA==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -887,14 +912,14 @@
 "@turf/sample@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/sample/-/sample-4.7.3.tgz#d030620c5e382076b7dcbe55ef83c4aa5eef24ab"
-  integrity sha1-0DBiDF44IHa33L5V74PEql7vJKs=
+  integrity sha512-gs7Qf9YRS7TTP9JETsYHOP+uLzjbrl+yAlskRdr7HEnaMis2aLiHsPhV74L4B+OQkQONpzR1C9qTPFxdQfmHGg==
   dependencies:
     "@turf/helpers" "^4.7.3"
 
 "@turf/sector@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/sector/-/sector-4.7.3.tgz#6fee9fad8067fd94cd74c844fe63444b6cdc5f1c"
-  integrity sha1-b+6frYBn/ZTNdMhE/mNES2zcXxw=
+  integrity sha512-DA2N5Ex7MaCcfFIoITkImHhCE8FZZsBVi+iKd/CzbAfLl5HdF+F0dTD9b9U+14K44+5z4a0mYlPa3IPdy/0ISw==
   dependencies:
     "@turf/circle" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -905,7 +930,7 @@
 "@turf/simplify@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/simplify/-/simplify-4.7.3.tgz#2efd5b468dcdf4751d05ee63b7a3ea46450875f3"
-  integrity sha1-Lv1bRo3N9HUdBe5jt6PqRkUIdfM=
+  integrity sha512-aa08e1AFXuL0zt+f1BxJ49SuuHPYT4hY1YxJIE8odjEOnYO82Mtgco6KkijrI2xrYAckr6QFqLYi7CWaH8SWmw==
   dependencies:
     "@turf/clean-coords" "^4.7.3"
     "@turf/clone" "^4.7.3"
@@ -916,7 +941,7 @@
 "@turf/square-grid@^4.4.0", "@turf/square-grid@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/square-grid/-/square-grid-4.7.3.tgz#b3e896b132a34fcc77ed3907efd9a4444db62259"
-  integrity sha1-s+iWsTKjT8x37TkH79mkRE22Ilk=
+  integrity sha512-H7INDZk61mdwxr1l03UeBAh4f1QSTxxAGLxT7SRAxTMoWSK4Wv7q2XCdettYCPvSW3ApEcUlnz5QnZUOKi8oAg==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/distance" "^4.7.3"
@@ -925,21 +950,21 @@
 "@turf/square@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/square/-/square-4.7.3.tgz#90391f7c1520ed62925488f466314426a5e4d33c"
-  integrity sha1-kDkffBUg7WKSVIj0ZjFEJqXk0zw=
+  integrity sha512-2upzaQMAWYgVuVj4jgR7t3yuXPcjVhbdh5KF2q4Caie2CiRKha9J7+lo+t2c1uD0XLj8uoWhQb9QxKdzyfRZ1w==
   dependencies:
     "@turf/distance" "^4.7.3"
 
 "@turf/tag@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/tag/-/tag-4.7.3.tgz#5a24fede581261f1c7c4f92a66815ba135942770"
-  integrity sha1-WiT+3lgSYfHHxPkqZoFboTWUJ3A=
+  integrity sha512-wmRKtb+VN8pNZ+z0EXjtJfuk6bXjUdxdT2L3kqfvYtNPE20W0Lx5LRT0eLEcYS8mmRX/qLhRhIGGgM05AUa+qw==
   dependencies:
     "@turf/inside" "^4.7.3"
 
 "@turf/tesselate@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/tesselate/-/tesselate-4.7.3.tgz#560af70c22f0b1de1f6c3b70e2bfdf3f844baced"
-  integrity sha1-Vgr3DCLwsd4fbDtw4r/fP4RLrO0=
+  integrity sha512-ykdjxUQWE9fAv8lNmNgUrERkIuQgeXWuSkvAS6pAbi8kqnUYRTXTPR+wQ/ACV+dkHLt0uznCkbUo6AxVO+ZNEA==
   dependencies:
     "@turf/helpers" "^4.7.3"
     earcut "^2.0.0"
@@ -947,14 +972,14 @@
 "@turf/tin@^4.4.0", "@turf/tin@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/tin/-/tin-4.7.3.tgz#6416209211e565539560dcf732858b701157ac7f"
-  integrity sha1-ZBYgkhHlZVOVYNz3MoWLcBFXrH8=
+  integrity sha512-eFLUkrpR9lf2uNZqObwJ7fmTr2PHvRpIXsfvJYNrf7e6q4lCEyWR20n1RdVSwRfOFr+H2vduMXRbNWxKNMB7bw==
   dependencies:
     "@turf/helpers" "^4.7.3"
 
 "@turf/transform-rotate@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/transform-rotate/-/transform-rotate-4.7.3.tgz#e07a837c27287265bf4910508677c50b8016bc67"
-  integrity sha1-4HqDfCcocmW/SRBQhnfFC4AWvGc=
+  integrity sha512-tJn7jmHy0s9WN2trZRggHWkpDx4LcuxunfaMtftsbrQcaLKNmYWapxhRZFm6QFpACDpK/d2baEfr+oml9eV+uA==
   dependencies:
     "@turf/centroid" "^4.7.3"
     "@turf/invariant" "^4.7.3"
@@ -966,7 +991,7 @@
 "@turf/transform-scale@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/transform-scale/-/transform-scale-4.7.3.tgz#f14d4ba992e58c9f33c0d71a96b834981c455ebc"
-  integrity sha1-8U1LqZLljJ8zwNcalrg0mBxFXrw=
+  integrity sha512-IrnMl5yjOdd757ec5T1inDDydzVthhX0yhbphhor4dixAByYw9XvX47FgGFNiU9e86Bz+rwV/gHrhGF0w4vuIg==
   dependencies:
     "@turf/bbox" "^4.7.3"
     "@turf/center" "^4.7.3"
@@ -982,7 +1007,7 @@
 "@turf/transform-translate@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/transform-translate/-/transform-translate-4.7.3.tgz#a7a2bc79e117b30af1e59de207a783585678b4ec"
-  integrity sha1-p6K8eeEXswrx5Z3iB6eDWFZ4tOw=
+  integrity sha512-dl1h2WSulCnvWipcMPE0pO0UcgS5ZaIn7wkROWltpwY2Ow/FKajx5NFyKtIP8cedgcFn4dLYYmp87FzV7JB4xw==
   dependencies:
     "@turf/invariant" "^4.7.3"
     "@turf/meta" "^4.7.3"
@@ -991,7 +1016,7 @@
 "@turf/triangle-grid@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/triangle-grid/-/triangle-grid-4.7.3.tgz#ced61311c51c0d1483ec038fedc9bbd0017e8900"
-  integrity sha1-ztYTEcUcDRSD7AOP7cm70AF+iQA=
+  integrity sha512-wtWWldYMtOdYu8lfzB8NlMqky87H6rqBkNqF2fTSb589RLtn15AWzHK66HboEgSCPFHaKqMjtJi2EE9TyMVbCA==
   dependencies:
     "@turf/distance" "^4.7.3"
     "@turf/helpers" "^4.7.3"
@@ -999,14 +1024,14 @@
 "@turf/truncate@^4.4.0", "@turf/truncate@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/truncate/-/truncate-4.7.3.tgz#827a8df8ff0c9fff9dcf1a4b3145cbdef80fb993"
-  integrity sha1-gnqN+P8Mn/+dzxpLMUXL3vgPuZM=
+  integrity sha512-QVhn747oSOpZCT3JqfeBPsGYKzMCgzL6DygraeZCtOLkb7SNAkmr9dlNrqpgDIc8sQ5/TJR5D9r7Ohqn/xRJcA==
   dependencies:
     "@turf/meta" "^4.7.3"
 
 "@turf/turf@4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@turf/turf/-/turf-4.4.0.tgz#08c3b8007a20bd05421fdf2d63061ef6fd231b53"
-  integrity sha1-CMO4AHogvQVCH98tYwYe9v0jG1M=
+  integrity sha512-jjEs5OtB8Iyj+URTAwUOnqbuCdgvHBo9iEL7FJOWtCofxakNBFrmdimm8lgsQySTrU10CoJB9wcUT/UNNHh3zQ==
   dependencies:
     "@turf/along" "^4.4.0"
     "@turf/area" "^4.4.0"
@@ -1089,14 +1114,14 @@
 "@turf/union@^4.4.0", "@turf/union@^4.7.3":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/union/-/union-4.7.3.tgz#012d4ac7465d6cad67fe4948d401b7f8be0fe412"
-  integrity sha1-AS1Kx0ZdbK1n/klI1AG3+L4P5BI=
+  integrity sha512-6mF3CJKJXGEUa9lNNM3yWc1dqEjEsoB92UoJPa0yr8zQOhgd4va1MoLh9QXHnWsGlevRa74Ob1e12mZxffcfdA==
   dependencies:
     jsts "1.3.0"
 
 "@turf/unkink-polygon@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/unkink-polygon/-/unkink-polygon-4.7.3.tgz#ca46bedf1f9f3b47f758f43a64f089414c974b93"
-  integrity sha1-yka+3x+fO0f3WPQ6ZPCJQUyXS5M=
+  integrity sha512-dHDmroMt7qqvr1WmhV5Q52p4ulpywDRCPR7P2ANV6af6JF/teKvHBXQnky0laMiEDLxBPmd/CRIccf6QhqfCXg==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/meta" "^4.7.3"
@@ -1105,7 +1130,7 @@
 "@turf/within@^3.13.0":
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/@turf/within/-/within-3.14.0.tgz#891a578323c292b9792269032dd74870e0e14c53"
-  integrity sha1-iRpXgyPCkrl5ImkDLddIcODhTFM=
+  integrity sha512-j4ljbcQrIqZ+slFDjk+BPlTITuNDNFy+o7l/ncAuiPMqcF1FOo5U4ztOpml/WmZgNeLT4Pr18rMMtp1RfBSrWQ==
   dependencies:
     "@turf/helpers" "^3.13.0"
     "@turf/inside" "^3.14.0"
@@ -1113,35 +1138,69 @@
 "@turf/within@^4.4.0":
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/@turf/within/-/within-4.7.3.tgz#41ab3c152f6a8c05caa5a345c97dd334d49aef13"
-  integrity sha1-Qas8FS9qjAXKpaNFyX3TNNSa7xM=
+  integrity sha512-8uOT6U8GFeC84tMAHw9ViFiOY3JZI49/Xfmm3wk+P43unv0iEl20pIFjwRmF10G14d3ca2AcOxmxuXVYWRXvGA==
   dependencies:
     "@turf/helpers" "^4.7.3"
     "@turf/inside" "^4.7.3"
 
+"@types/cacheable-request@^6.0.1":
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
+  integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
+  dependencies:
+    "@types/http-cache-semantics" "*"
+    "@types/keyv" "^3.1.4"
+    "@types/node" "*"
+    "@types/responselike" "^1.0.0"
+
+"@types/http-cache-semantics@*":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+  integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+
+"@types/keyv@^3.1.4":
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
+  integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/minimist@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
-  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+
+"@types/node@*":
+  version "20.4.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.2.tgz#129cc9ae69f93824f92fac653eebfb4812ab4af9"
+  integrity sha512-Dd0BYtWgnWJKwO1jkmTrzofjK2QXXcai0dmtzvIBhcA+RsG5h8R3xlyta0kGOZRNfL9GuRtb1knmPEhQrePCEw==
 
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
-  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+
+"@types/responselike@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+  integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
+  dependencies:
+    "@types/node" "*"
 
 "@types/unist@^2.0.0", "@types/unist@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
-  integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.7.tgz#5b06ad6894b236a1d2bd6b2f07850ca5c59cf4d6"
+  integrity sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==
 
 "JSV@>= 4.0.x":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
-  integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=
+  integrity sha512-ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==
 
 affine-hull@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/affine-hull/-/affine-hull-1.0.0.tgz#763ff1d38d063ceb7e272f17ee4d7bbcaf905c5d"
-  integrity sha1-dj/x040GPOt+Jy8X7k17vK+QXF0=
+  integrity sha512-3QNG6+vFAwJvSZHsJYDJ/mt1Cxx9n5ffA+1Ohmj7udw0JuRgUVIXK0P9N9pCMuEdS3jCNt8GFX5q2fChq+GO3Q==
   dependencies:
     robust-orientation "^1.1.3"
 
@@ -1160,34 +1219,34 @@ ansi-styles@^3.2.1:
 ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
-  integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
+  integrity sha512-3iF4FIKdxaVYT3JqQuY3Wat/T2t7TRbbQ94Fu50ZUCbLy4TFbTzr90NOHQodQkNqmeEGCw8WbeP78WNi6SKYUA==
 
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 backbone@1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999"
-  integrity sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk=
+  integrity sha512-aK+k3TiU4tQDUrRCymDDE7XDFnMVuyE6zbZ4JX7mb4pJbQTVOH997/kyBzb8wB2s5Y/Oh7EUfj+sZhwRPxWwow==
   dependencies:
     underscore ">=1.8.3"
 
 base-64@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb"
-  integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs=
+  integrity sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==
 
 bit-twiddle@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bit-twiddle/-/bit-twiddle-1.0.2.tgz#0c6c1fabe2b23d17173d9a61b7b7093eb9e1769e"
-  integrity sha1-DGwfq+KyPRcXPZpht7cJPrnhdp4=
+  integrity sha512-B9UhK0DKFZhoTFcfvAzhqsjStvGJp9vYWf3+6SNTtdSQnvIgfkHbgHrg/e4+TH71N2GDu8tpmCVoyfrL1d7ntA==
 
 bootstrap-colorpicker@^2.5.3:
   version "2.5.3"
@@ -1202,22 +1261,35 @@ bootstrap@3.4.1, bootstrap@^3.3:
   integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
 
 buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-cacheable-request@^2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
-  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
-  dependencies:
-    clone-response "1.0.2"
-    get-stream "3.0.0"
-    http-cache-semantics "3.8.1"
-    keyv "3.0.0"
-    lowercase-keys "1.0.0"
-    normalize-url "2.0.1"
-    responselike "1.0.2"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
+cacheable-lookup@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
+cacheable-request@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
+  integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^4.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^6.0.1"
+    responselike "^2.0.0"
+
+call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
 
 camelcase-keys@^6.2.2:
   version "6.2.2"
@@ -1245,7 +1317,7 @@ chalk@^2.0.0:
 chalk@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-  integrity sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=
+  integrity sha512-sQfYDlfv2DGVtjdoQqxS0cEZDroyG8h6TamA6rvxwlrU5BaSLDx9xhatBYl2pxZ7gmpNaPFVwBtdGdu5rQ+tYQ==
   dependencies:
     ansi-styles "~1.0.0"
     has-color "~0.1.0"
@@ -1261,17 +1333,17 @@ ckeditor@^4.6.2:
   resolved "https://registry.yarnpkg.com/ckeditor/-/ckeditor-4.12.1.tgz#954a7b028dd611e44ba51cc7c2fe051cf1052186"
   integrity sha512-pH2Su4oi0D4iN/3U8nUcwI7/lXHoOJi0aiN8e2zxnm4Ow5kq8eZP2ZGmpYyuqRyKZ2tHaU8+OyYi7laXcjiq9Q==
 
-clone-response@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+clone-response@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3"
+  integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==
   dependencies:
     mimic-response "^1.0.0"
 
 codemirror@^5.65.6:
-  version "5.65.6"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.6.tgz#fc313797331cbeb3bcab0652d1ec9d0f40c23ab5"
-  integrity sha512-zNihMSMoDxK9Gqv9oEyDT8oM51rcRrQ+IEo2zyS48gJByBq5Fj8XuNEguMra+MuIOuh6lkpnLUJeL70DoTt6yw==
+  version "5.65.13"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.13.tgz#c098a6f409db8b5a7c5722788bd9fa3bb2367f2e"
+  integrity sha512-SVWEzKXmbHmTQQWaz03Shrh4nybG0wXx2MEu3FO4ezbPW8IbnZEd5iGHGEffSUaitKYa3i+pHpBsSvw8sPHtzg==
 
 color-convert@^1.9.0:
   version "1.9.3"
@@ -1283,7 +1355,7 @@ color-convert@^1.9.0:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 combined-stream@^1.0.8:
   version "1.0.8"
@@ -1307,69 +1379,61 @@ concat-stream@^1.6.1:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
-  integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.0.2"
-    typedarray "^0.0.6"
-
 convex-hull@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/convex-hull/-/convex-hull-1.0.3.tgz#20a3aa6ce87f4adea2ff7d17971c9fc1c67e1fff"
-  integrity sha1-IKOqbOh/St6i/30XlxyfwcZ+H/8=
+  integrity sha512-24rZAoh81t41GHPLAxcsokgjH9XNoVqU2OiSi8iMHUn6HUURfiefcEWAPt1AfwZjBBWTKadOm1xUcUMnfFukhQ==
   dependencies:
     affine-hull "^1.0.0"
     incremental-convex-hull "^1.0.1"
     monotone-convex-hull-2d "^1.0.1"
 
 core-js@^2.5.7:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
-  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 csscolorparser@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/csscolorparser/-/csscolorparser-1.0.3.tgz#b34f391eea4da8f3e98231e2ccd8df9c041f171b"
-  integrity sha1-s085HupNqPPpgjHizNjfnAQfFxs=
+  integrity sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w==
 
 cytoscape-cola@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/cytoscape-cola/-/cytoscape-cola-2.4.0.tgz#3e21491f99f0a776a894faf87a2fc7c7e6cf4534"
-  integrity sha512-zY029SIMi08DRSZatC3oQD7e77ufvkXMiLHmex6Tv2U9F1Qn/+CrQQtjry32VQEYcj0jKj6W/YCH2T+samrCHw==
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/cytoscape-cola/-/cytoscape-cola-2.5.1.tgz#1ec25dfd92533485f29943adf740ecd4feb2ea16"
+  integrity sha512-4/2S9bW1LvdsEPmxXN1OEAPFPbk7DvCx2c9d+TblkQAAvptGaSgtPWCByTEGgT8UxCxcVqes2aFPO5pzwo7R2w==
   dependencies:
     webcola "^3.4.0"
 
 cytoscape@^3.18.2:
-  version "3.18.2"
-  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.18.2.tgz#e5a1b37de3b53946a6d8f8586eefa44a0978ade4"
-  integrity sha512-NRY3JTrUzx0fSn44LyMlPqC8/zuuOo8kbr2hFlfjiObRmtir+lnxVg08f8wUA4X/P80df9vSThKDASl39yH+Iw==
+  version "3.25.0"
+  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.25.0.tgz#5289e9d18be0293b073bfe93f83bb95b908b2dc1"
+  integrity sha512-7MW3Iz57mCUo6JQCho6CmPBCbTlJr7LzyEtIkutG255HLVd4XuBg2I9BkTZLI/e4HoaOB/BiAzXuQybQ95+r9Q==
   dependencies:
     heap "^0.2.6"
-    lodash.debounce "^4.0.8"
+    lodash "^4.17.21"
 
 d3-array@1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
   integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
 
-"d3-array@1.2.0 - 2", d3-array@2, d3-array@>=2.5:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.7.1.tgz#b1f56065e9aba1ef6f0d0c8c9390b65421593352"
-  integrity sha512-dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q==
+d3-array@2, d3-array@^2.3.0, d3-array@^2.5.0:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81"
+  integrity sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==
+  dependencies:
+    internmap "^1.0.0"
 
 d3-axis@2:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-2.0.0.tgz#40aebb65626ffe6d95e9441fbf9194274b328a8b"
-  integrity sha512-9nzB0uePtb+u9+dWir+HTuEAKJOEUYJoEwbJPsZ1B4K3iZUgzJcSENQ05Nj7S4CIfbZZ8/jQGoUzGKFznBhiiQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-2.1.0.tgz#978db534092711117d032fad5d733d206307f6a0"
+  integrity sha512-z/G2TQMyuf0X3qP+Mh+2PimoJD41VOCjViJzT0BHeL/+JQAofkiWZbWxlwFGb1N8EN+Cl/CW+MUKbVzr1689Cw==
 
 d3-brush@2:
   version "2.1.0"
@@ -1470,11 +1534,11 @@ d3-force@2:
   integrity sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==
 
 d3-geo@2:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-2.0.1.tgz#2437fdfed3fe3aba2812bd8f30609cac83a7ee39"
-  integrity sha512-M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-2.0.2.tgz#c065c1b71fe8c5f1be657e5f43d9bdd010383c40"
+  integrity sha512-8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA==
   dependencies:
-    d3-array ">=2.5"
+    d3-array "^2.5.0"
 
 d3-geo@^1.6.3:
   version "1.12.1"
@@ -1529,14 +1593,14 @@ d3-scale-chromatic@2:
     d3-interpolate "1 - 2"
 
 d3-scale@3:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.2.2.tgz#36d4cbc94dc38bbb5bd91ba5eddb44c6d19bad3e"
-  integrity sha512-3Mvi5HfqPFq0nlyeFlkskGjeqrR/790pINMHc4RXKJ2E6FraTd3juaRIRZZHyMAbi3LjAMW0EH4FB1WgoGyeXg==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.3.0.tgz#28c600b29f47e5b9cd2df9749c206727966203f3"
+  integrity sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==
   dependencies:
-    d3-array "1.2.0 - 2"
+    d3-array "^2.3.0"
     d3-format "1 - 2"
     d3-interpolate "1.2.0 - 2"
-    d3-time "1 - 2"
+    d3-time "^2.1.1"
     d3-time-format "2 - 3"
 
 d3-selection@1:
@@ -1550,9 +1614,9 @@ d3-selection@2:
   integrity sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==
 
 d3-shape@2:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-2.0.0.tgz#2331b62fa784a2a1daac47a7233cfd69301381fd"
-  integrity sha512-djpGlA779ua+rImicYyyjnOjeubyhql1Jyn1HK0bTyawuH76UQRWXd+pftr67H6Fa8hSwetkgb/0id3agKWykw==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-2.1.0.tgz#3b6a82ccafbc45de55b57fcf956c584ded3b666f"
+  integrity sha512-PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA==
   dependencies:
     d3-path "1 - 2"
 
@@ -1570,10 +1634,12 @@ d3-shape@^1.3.5:
   dependencies:
     d3-time "1 - 2"
 
-"d3-time@1 - 2", d3-time@2:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-2.0.0.tgz#ad7c127d17c67bd57a4c61f3eaecb81108b1e0ab"
-  integrity sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q==
+"d3-time@1 - 2", d3-time@2, d3-time@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-2.1.1.tgz#e9d8a8a88691f4548e68ca085e5ff956724a6682"
+  integrity sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==
+  dependencies:
+    d3-array "2"
 
 "d3-timer@1 - 2", d3-timer@2:
   version "2.0.0"
@@ -1608,9 +1674,9 @@ d3-zoom@2:
     d3-transition "2"
 
 d3@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-6.1.1.tgz#c92f8dfb5d6889ee0d518ea1e0e6afb8642ef991"
-  integrity sha512-bJYW9wlS2uvP2EoMkcPptrUzLMHQKCbiSW+/la8iGSLZgs4KbI/f3Fch4RtnUA9PA+/nPlwyFYzTwDjX80Of8w==
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-6.7.0.tgz#adac458597b4a2cafe8e08cf30948af0c95cd61f"
+  integrity sha512-hNHRhe+yCDLUG6Q2LwvR/WdNFPOJQ5VWqsJcwIYVeI401+d2/rrCjxSXkiAdIlpx7/73eApFB4Olsmh3YN7a6g==
   dependencies:
     d3-array "2"
     d3-axis "2"
@@ -1643,7 +1709,15 @@ d3@^6.1.1:
     d3-transition "2"
     d3-zoom "2"
 
-datatables.net-bs@>=1.11.3, datatables.net-bs@~1.12.1:
+datatables.net-bs@>=1.11.3, datatables.net-bs@>=1.13.4:
+  version "1.13.5"
+  resolved "https://registry.yarnpkg.com/datatables.net-bs/-/datatables.net-bs-1.13.5.tgz#882416c5acf5edee452bc7ea5f429db03b7c13a9"
+  integrity sha512-ZIiQAKwwIV+BoGijH3MHm6Vc7WB0icFxAF8uxx7nyZr5WMw1R7Pt5pqU1MqwjyjWtu81OveXQdRuwHMijey6ww==
+  dependencies:
+    datatables.net ">=1.13.4"
+    jquery ">=1.7"
+
+datatables.net-bs@~1.12.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/datatables.net-bs/-/datatables.net-bs-1.12.1.tgz#8165516519aade3d49a0b562c617bcce794a00b9"
   integrity sha512-oaX1mNhjnASo33mwv6QzgGxD3pAz69qAL+8YlCro3e7oMvszE6wJyprEt80vl8E/TiMp/UUvsaqsup1JZFfMBQ==
@@ -1652,20 +1726,20 @@ datatables.net-bs@>=1.11.3, datatables.net-bs@~1.12.1:
     jquery ">=1.7"
 
 datatables.net-buttons-bs@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs/-/datatables.net-buttons-bs-2.2.3.tgz#e495102f6375e59c8d373758476f03a1b920128c"
-  integrity sha512-xU36tvuzjwcWh3IbUj9zKhsFUi7lVHeRy/fFP0xjB3bILItsX7Ni3lNDXUotJkYzDIjXBZKDLetXeA0JKKO4tw==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs/-/datatables.net-buttons-bs-2.4.1.tgz#945c43d9ea05466192f96361d7a099cd4160cb4b"
+  integrity sha512-7UrFP4Hez0FpRKYkRJJOr9hIZUhr2PnwvcCKr3FRyzdlz3ntViMJbZZv+L97YmNeiRAom7gmnO1Nt9eAYtxuiw==
   dependencies:
-    datatables.net-bs ">=1.11.3"
-    datatables.net-buttons ">=2.0.1"
+    datatables.net-bs ">=1.13.4"
+    datatables.net-buttons ">=2.3.6"
     jquery ">=1.7"
 
-datatables.net-buttons@>=2.0.1, datatables.net-buttons@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/datatables.net-buttons/-/datatables.net-buttons-2.2.3.tgz#d0a2c5a4dcb48fa46f2c4435aaddf1ec45ed6e47"
-  integrity sha512-9Xz52grBQxAgs6Meo+j/8koxrhnINt0fTc9tLYYb4UHxgtM2BzTGV4NA8KxXGxVjslem41e0quC5eXpXt9d4tw==
+datatables.net-buttons@>=2.3.6, datatables.net-buttons@^2.2.3:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/datatables.net-buttons/-/datatables.net-buttons-2.4.1.tgz#a548943494a37b0b7907c7b9afcf3ebaa29c17aa"
+  integrity sha512-Z788xsbGW+YqJWgQYCzE5IsbY8MNIihhDP/LOefijEn7MM1/jf4sQdf/KRNHr/CWTFGfojGPz+GNdJh8appeQQ==
   dependencies:
-    datatables.net ">=1.11.3"
+    datatables.net ">=1.13.4"
     jquery ">=1.7"
 
 datatables.net-responsive-bs@~2.3.0:
@@ -1677,7 +1751,15 @@ datatables.net-responsive-bs@~2.3.0:
     datatables.net-responsive ">=2.2.9"
     jquery ">=1.7"
 
-datatables.net-responsive@>=2.2.9, datatables.net-responsive@~2.3.0:
+datatables.net-responsive@>=2.2.9:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/datatables.net-responsive/-/datatables.net-responsive-2.5.0.tgz#56919903646648f362f58c25784794fb89effda1"
+  integrity sha512-GL7DFiRl5qqrp5ql54Psz92xTGPR0rMcrO3hzNxMfvcfpRGL5zFNTvMpTUh59Erm6u1+KoX+j+Ig1ZD3r0iFsA==
+  dependencies:
+    datatables.net ">=1.13.4"
+    jquery ">=1.7"
+
+datatables.net-responsive@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/datatables.net-responsive/-/datatables.net-responsive-2.3.0.tgz#2b8d894af5456f8c8a320eeac5e837a24d84e033"
   integrity sha512-QA5QsD1sJQRQ7/IFi3rSd33O84f/Augz2KnaehjfuEANtK4KeC9Lbkut5tPuuMcK4jOpQPOOPYTbmfrt+tfh9w==
@@ -1685,7 +1767,14 @@ datatables.net-responsive@>=2.2.9, datatables.net-responsive@~2.3.0:
     datatables.net ">=1.11.3"
     jquery ">=1.7"
 
-datatables.net@>=1.11.3, datatables.net@~1.12.1:
+datatables.net@>=1.11.3, datatables.net@>=1.13.4:
+  version "1.13.5"
+  resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.5.tgz#790a3d70d5e103f5465ed8c52a50eb242e1e2dc4"
+  integrity sha512-XoCQHkUM5MwbC3Wx7WpVvt4i880J8pIFDA9HIKD4GhvtalryBfmdd+bZvrc/rEbraZS7U4eR2k8/wFY0NeHVqQ==
+  dependencies:
+    jquery ">=1.7"
+
+datatables.net@~1.12.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.12.1.tgz#3e625e49a3341f605b0efb519fae94e37b278f24"
   integrity sha512-e6XAMUoV41JdQPS/r9YRfRcmTPcCVvyZbWI+xog1Zg+kjVliMQbEkvWK5XFItmi64Cvwg+IqsZbTUJ1KSY3umA==
@@ -1700,9 +1789,9 @@ debug@^2.6.3:
     ms "2.0.0"
 
 decamelize-keys@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
-  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
+  integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -1710,19 +1799,14 @@ decamelize-keys@^1.1.0:
 decamelize@^1.1.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+decompress-response@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
   dependencies:
-    mimic-response "^1.0.0"
+    mimic-response "^3.1.0"
 
 deep-equal@^1.0.0, deep-equal@^1.0.1:
   version "1.1.1"
@@ -1736,12 +1820,18 @@ deep-equal@^1.0.0, deep-equal@^1.0.1:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-define-properties@^1.1.2, define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+defer-to-connect@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
+
+define-properties@^1.1.3, define-properties@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
+  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
   dependencies:
-    object-keys "^1.0.12"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
 
 delaunator@4:
   version "4.0.1"
@@ -1751,35 +1841,37 @@ delaunator@4:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 dom4@^2.0.1:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/dom4/-/dom4-2.1.5.tgz#f98a94eb67b340f0fa5b42b0ee9c38cda035428e"
-  integrity sha512-gJbnVGq5zaBUY0lUh0LUEVGYrtN75Ks8ZwpwOYvnVFrKy/qzXK4R/1WuLIFExWj/tBxbRAkTzZUGJHXmqsBNjQ==
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/dom4/-/dom4-2.1.6.tgz#c90df07134aa0dbd81ed4d6ba1237b36fc164770"
+  integrity sha512-JkCVGnN4ofKGbjf5Uvc8mmxaATIErKQKSgACdBXpsQ3fY6DlIpAyWfiBSrGkttATssbDCp3psiAKWXk5gmjycA==
 
 dropzone@5.7.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.7.0.tgz#8d1007f3ebcc6e6d64096823f854d898f7564ef2"
   integrity sha512-kOltiZXH5cO/72I22JjE+w6BoT6uaVLfWdFMsi1PMKFkU6BZWpqRwjnsRm0o6ANGTBuZar5Piu7m/CbKqRPiYg==
 
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
-
 earcut@^2.0.0, earcut@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.2.tgz#41b0bc35f63e0fe80da7cddff28511e7e2e80d11"
-  integrity sha512-eZoZPPJcUHnfRZ0PjLvx2qBordSiO8ofC3vt+qACLM95u+4DovnbYNpQtJh0DNsWj8RnxrQytD4WA8gj5cRIaQ==
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a"
+  integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==
+
+end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
 
-eonasdan-bootstrap-datetimepicker@4.17.44:
-  version "4.17.44"
-  resolved "https://registry.yarnpkg.com/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.44.tgz#cf966f38e777294f72926bb34ed362d1ef861e63"
-  integrity sha1-z5ZvOOd3KU9ykmuzTtNi0e+GHmM=
+eonasdan-bootstrap-datetimepicker@~4.17.49:
+  version "4.17.49"
+  resolved "https://registry.yarnpkg.com/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.49.tgz#5534ba581c1e7eb988dbf773e2fed8a7f48cc76a"
+  integrity sha512-7KZeDpkj+A6AtPR3XjX8gAnRPUkPSfW0OmMANG1dkUOPMtLSzbyoCjDIdEcfRtQPU5X0D9Gob7wWKn0h4QWy7A==
   dependencies:
     bootstrap "^3.3"
-    jquery "^1.8.3 || ^2.0"
+    jquery "^3.5.1"
     moment "^2.10"
     moment-timezone "^0.4.0"
 
@@ -1790,36 +1882,10 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
-  version "1.17.6"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
-  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.0"
-    is-regex "^1.1.0"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 eventemitter3@^3.1.0:
   version "3.1.2"
@@ -1837,34 +1903,31 @@ find-up@^4.1.0:
 font-awesome@~4.6.3:
   version "4.6.3"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.6.3.tgz#86933651540ee00874c664017f50f2172f6531a2"
-  integrity sha1-hpM2UVQO4Ah0xmQBf1DyFy9lMaI=
+  integrity sha512-I5rWuHv7MI5uYDGFT1SJohxdkTfks41QQ9fvMEzvBnWppsehXnoj8LNuW4MGtawSrHvApYVhCZSC7rk5wDycyw==
 
 form-data@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
-  integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-from2@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+functions-have-names@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+
 fuzzy@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
-  integrity sha1-THbsL/CsGjap3M+aAN+GIweNTtg=
+  integrity sha512-/gZffu4ykarLrCiP3Ygsa86UAo1E5vEVlvTrpkKywXSbP9Xhln3oSp9QSV57gEq3JFFpGJ4GZ+5zdEp3FcUh4w==
 
 geodesy@1.1.2:
   version "1.1.2"
@@ -1874,7 +1937,7 @@ geodesy@1.1.2:
 geojson-dissolve@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/geojson-dissolve/-/geojson-dissolve-3.1.0.tgz#86823271680a1a381f3e72f02648bbcc710ecda1"
-  integrity sha1-hoIycWgKGjgfPnLwJki7zHEOzaE=
+  integrity sha512-JXHfn+A3tU392HA703gJbjmuHaQOAE/C1KzbELCczFRFux+GdY6zt1nKb1VMBHp4LWeE7gUY2ql+g06vJqhiwQ==
   dependencies:
     "@turf/meta" "^3.7.5"
     geojson-flatten "^0.2.1"
@@ -1885,7 +1948,7 @@ geojson-dissolve@3.1.0:
 geojson-equality@0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/geojson-equality/-/geojson-equality-0.1.6.tgz#a171374ef043e5d4797995840bae4648e0752d72"
-  integrity sha1-oXE3TvBD5dR5eZWEC65GSOB1LXI=
+  integrity sha512-TqG8YbqizP3EfwP5Uw4aLu6pKkg6JQK9uq/XZ1lXQntvTHD1BBKJWhNpJ2M0ax6TuWMP3oyx6Oq7FCIfznrgpQ==
   dependencies:
     deep-equal "^1.0.0"
 
@@ -1897,10 +1960,15 @@ geojson-flatten@^0.2.1, geojson-flatten@~0.2.1:
     get-stdin "^6.0.0"
     minimist "1.2.0"
 
+geojson-flatten@^1.0.4:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/geojson-flatten/-/geojson-flatten-1.1.1.tgz#601aae07ba6406281ebca683573dcda69eba04c7"
+  integrity sha512-k/6BCd0qAt7vdqdM1LkLfAy72EsLDy0laNwX0x2h49vfYCiQkRc4PSra8DNEdJ10EKRpwEvDXMb0dBknTJuWpQ==
+
 geojson-linestring-dissolve@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/geojson-linestring-dissolve/-/geojson-linestring-dissolve-0.0.1.tgz#08ab8cdf386e919d35a0eb38fa1c550e020838db"
-  integrity sha1-CKuM3zhukZ01oOs4+hxVDgIIONs=
+  integrity sha512-Y8I2/Ea28R/Xeki7msBcpMvJL2TaPfaPKP8xqueJfQ9/jEhps+iOJxOR2XCBGgVb12Z6XnDb1CMbaPfLepsLaw==
 
 geojson-polygon-self-intersections@^1.1.2:
   version "1.2.1"
@@ -1912,12 +1980,12 @@ geojson-polygon-self-intersections@^1.1.2:
 geojson-random@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/geojson-random/-/geojson-random-0.2.2.tgz#ab4838f126adc5e16f8f94e655def820f9119dbc"
-  integrity sha1-q0g48SatxeFvj5TmVd74IPkRnbw=
+  integrity sha512-/vZQ14mjKPG3LJ7bpyXsJ0aoz8NzvwpwwP//uBgbzIu2BCFd4uRagp1QvY3RAzRQsHOHyVh33dbYUYws7vOCkg==
 
 geojson-rbush@^1.0.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/geojson-rbush/-/geojson-rbush-1.2.0.tgz#eca3b6a3afb899a453ef82d5e2373092e20d77e5"
-  integrity sha1-7KO2o6+4maRT74LV4jcwkuINd+U=
+  integrity sha512-iiMclCIFRNLuTNghpvKNd7K11D1esI21qJGuptk3w8frT8cgjtjBiCrQHL0aAhrOOUq8atbXuvY/dhtA3+tJdw==
   dependencies:
     "@turf/meta" "^4.6.0"
     rbush "^2.0.1"
@@ -1925,7 +1993,7 @@ geojson-rbush@^1.0.1:
 geojson-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/geojson-utils/-/geojson-utils-1.1.0.tgz#e8ffb4c81c0a75b3e306f5187265d6f23040f50b"
-  integrity sha1-6P+0yBwKdbPjBvUYcmXW8jBA9Qs=
+  integrity sha512-9irmjugYFrMvGjMw+qW5BQpghJO4ClFMDdPzVe2oDgtH2DhoKMaXqjIYPS5VpfrcnV0kOSrXcj8D9Izmr0AM9Q==
 
 geojson-vt@^3.2.1:
   version "3.2.1"
@@ -1935,45 +2003,56 @@ geojson-vt@^3.2.1:
 get-closest@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/get-closest/-/get-closest-0.0.4.tgz#269ac776d1e6022aa0fd586dd708e8a7d32269af"
-  integrity sha1-JprHdtHmAiqg/Vht1wjop9Miaa8=
+  integrity sha512-oMgZYUtnPMZB6XieXiUADpRIc5kfD+RPfpiYe9aIlEYGIcOx2mTGgKmUkctlLof/ANleypqOJRhQypbrh33DkA==
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
 
 get-stdin@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
   integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
 
-get-stream@3.0.0, get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 gl-matrix@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.3.0.tgz#232eef60b1c8b30a28cbbe75b2caf6c48fd6358b"
-  integrity sha512-COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA==
-
-got@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
-  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
-  dependencies:
-    "@sindresorhus/is" "^0.7.0"
-    cacheable-request "^2.1.1"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    into-stream "^3.1.0"
-    is-retry-allowed "^1.1.0"
-    isurl "^1.0.0-alpha5"
-    lowercase-keys "^1.0.0"
-    mimic-response "^1.0.0"
-    p-cancelable "^0.4.0"
-    p-timeout "^2.0.1"
-    pify "^3.0.0"
-    safe-buffer "^5.1.1"
-    timed-out "^4.0.1"
-    url-parse-lax "^3.0.0"
-    url-to-options "^1.0.1"
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9"
+  integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==
+
+got@^11.8.5:
+  version "11.8.6"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
+  integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
+  dependencies:
+    "@sindresorhus/is" "^4.0.0"
+    "@szmarczak/http-timer" "^4.0.5"
+    "@types/cacheable-request" "^6.0.1"
+    "@types/responselike" "^1.0.0"
+    cacheable-lookup "^5.0.3"
+    cacheable-request "^7.0.2"
+    decompress-response "^6.0.0"
+    http2-wrapper "^1.0.0-beta.5.2"
+    lowercase-keys "^2.0.0"
+    p-cancelable "^2.0.0"
+    responselike "^2.0.0"
 
 grid-index@^1.1.0:
   version "1.1.0"
@@ -1983,7 +2062,7 @@ grid-index@^1.1.0:
 grid-to-matrix@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/grid-to-matrix/-/grid-to-matrix-1.2.0.tgz#b016df4d76f996e6b74663eab9ceb913546657e9"
-  integrity sha1-sBbfTXb5lua3RmPquc65E1RmV+k=
+  integrity sha512-kk7Z61HfvexDS8KxVnxU7XFiwgvRRoSKLYosUhe9Nl8eGkPgMHke7daavhNqonNgQsxpCRx9klbnlNSmGE3MPQ==
   dependencies:
     "@turf/helpers" "^4.1.0"
     "@turf/invariant" "^4.1.0"
@@ -2006,29 +2085,36 @@ hard-rejection@^2.1.0:
 has-color@~0.1.0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
-  integrity sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=
+  integrity sha512-kaNz5OTAYYmt646Hkqw50/qyxP2vFnTVu5AQ1Zmk22Kk5+4Qx6BpO8+u7IKsML5fOsFk0ZT0AcCJNYwcvaLBvw==
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
-has-symbol-support-x@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
-  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+has-proto@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
+has-symbols@^1.0.2, has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
-has-to-string-tag-x@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
-  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
   dependencies:
-    has-symbol-support-x "^1.4.1"
+    has-symbols "^1.0.2"
 
 has@^1.0.3:
   version "1.0.3"
@@ -2040,22 +2126,30 @@ has@^1.0.3:
 hat@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a"
-  integrity sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo=
+  integrity sha512-zpImx2GoKXy42fVDSEad2BPKuSQdLcqsCYa48K3zHSzM/ugWuYjLDr8IXxpVuL7uCLHw56eaiLxCRthhOzf5ug==
 
 heap@^0.2.6:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.6.tgz#087e1f10b046932fc8594dd9e6d378afc9d1e5ac"
-  integrity sha1-CH4fELBGky/IWU3Z5tN4r8nR5aw=
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.7.tgz#1e6adf711d3f27ce35a81fe3b7bd576c2260a8fc"
+  integrity sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-http-cache-semantics@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+http-cache-semantics@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
+
+http2-wrapper@^1.0.0-beta.5.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
+  dependencies:
+    quick-lru "^5.1.1"
+    resolve-alpn "^1.0.0"
 
 iconv-lite@0.4:
   version "0.4.24"
@@ -2065,14 +2159,14 @@ iconv-lite@0.4:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.12:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 incremental-convex-hull@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/incremental-convex-hull/-/incremental-convex-hull-1.0.1.tgz#51428c14cb9d9a6144bfe69b2851fb377334be1e"
-  integrity sha1-UUKMFMudmmFEv+abKFH7N3M0vh4=
+  integrity sha512-mKRJDXtzo1R9LxCuB1TdwZXHaPaIEldoGPsXy2jrJc/kufyqp8y/VAQQxThSxM2aroLoh6uObexPk1ASJ7FB7Q==
   dependencies:
     robust-orientation "^1.1.2"
     simplicial-complex "^1.0.0"
@@ -2082,147 +2176,117 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
+inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-into-stream@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
-  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
-  dependencies:
-    from2 "^2.1.1"
-    p-is-promise "^1.1.0"
+internmap@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
+  integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
 
 ionicons@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-2.0.1.tgz#ca398113293ea870244f538f0aabbd4b5b209a3e"
-  integrity sha1-yjmBEyk+qHAkT1OPCqu9S1sgmj4=
+  integrity sha512-ySWjaL3PxB4JFMvr7/02sByWM7TQv1mrvRYFvUwFcVEEHEK/RKEP6MFhcnTmKhoPM6Ih6s5wH003fkVk1wiXLQ==
 
 is-arguments@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
-  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
+  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-buffer@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
-is-callable@^1.1.4, is-callable@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
-  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+is-core-module@^2.11.0:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
+  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
+  dependencies:
+    has "^1.0.3"
 
 is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+  dependencies:
+    has-tostringtag "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
 
-is-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
-
-is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
+is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
-is-regex@^1.0.4, is-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
-  dependencies:
-    has-symbols "^1.0.1"
+  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
-is-retry-allowed@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
-  integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
-
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+is-regex@^1.0.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
   dependencies:
-    has-symbols "^1.0.1"
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
 
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isurl@^1.0.0-alpha5:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
-  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
-  dependencies:
-    has-to-string-tag-x "^1.2.0"
-    is-object "^1.0.1"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 jqtree@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/jqtree/-/jqtree-1.3.4.tgz#dd56ef3bc96d1098115392d41ef1b1f5aec47469"
-  integrity sha1-3VbvO8ltEJgRU5LUHvGx9a7EdGk=
+  integrity sha512-iHEF7ZEQMTIeikxMstYVWbiWQSBBVAI5veKJZ5uYPpk843+hDXZfMhgT89k64fba/KkG0O6mcZ85JYnvIBH0hQ==
   dependencies:
     jquery ">=1.9"
 
-jquery-migrate@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/jquery-migrate/-/jquery-migrate-3.4.0.tgz#915d6e914c76bd7410a58c86d20fec0052784af9"
-  integrity sha512-K0W02EhZyqjVpyF5pdi+t238cIfQACzMsXiX4AEfEOxPPfiZZFzf3brtFY21FOOEPiWZF4mH04TXHDE6e2YDyg==
+jquery-migrate@~3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/jquery-migrate/-/jquery-migrate-3.4.1.tgz#6a7114626b80e0d9e1cb77f170623efd85c5fc9c"
+  integrity sha512-6RaV23lLAYccu8MtLfy2sIxOvx+bulnWHm/pvffAi7KOzPk1sN9IYglpkl1ZNCj1FSgSNDPS2fSZ1hWsXc200Q==
 
 jquery-validation@1.19.5:
   version "1.19.5"
   resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.5.tgz#557495b7cad79716897057c4447ad3cd76fda811"
   integrity sha512-X2SmnPq1mRiDecVYL8edWx+yTBZDyC8ohWXFhXdtqFHgU9Wd4KHkvcbCoIZ0JaSaumzS8s2gXSkP8F7ivg/8ZQ==
 
-jquery@3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
-  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
-
-jquery@>=1.10, jquery@>=1.7, jquery@>=1.9, jquery@>=1.9.0:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
-  integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
-
-"jquery@^1.8.3 || ^2.0":
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
-  integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=
+jquery@>=1.10, jquery@>=1.7, jquery@>=1.9, jquery@>=1.9.0, jquery@^3.5.1, jquery@^3.6.1:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.0.tgz#fe2c01a05da500709006d8790fe21c8a39d75612"
+  integrity sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==
 
 jqueryui@1.11.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/jqueryui/-/jqueryui-1.11.1.tgz#8718550705f5568d1199196169094db73b2291bc"
-  integrity sha1-hxhVBwX1Vo0RmRlhaQlNtzsikbw=
+  integrity sha512-w3k80seYwcirTMG7fhd1MfqYx2dMO9fEi+I0vUN5hbX5+y7YIWySJkFsCBj4UBNuFcYOfUk6I63sUG/hCawdZA==
 
 js-cookie@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.1.tgz#26ada7902e91fe7f8bb01b4831912c724739f381"
-  integrity sha1-Jq2nkC6R/n+LsBtIMZEsckc584E=
+  integrity sha512-BYjLHmXr/YFnH1x+wmK5qSSsag7bKRF7JDp6BRBsSjIXOnZoI6Y+JrmlCqN99/9MQq/Dim/cc949wwkEJCuPnQ==
 
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-json-buffer@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
@@ -2232,7 +2296,7 @@ json-parse-even-better-errors@^2.3.0:
 jsonlint-lines@1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/jsonlint-lines/-/jsonlint-lines-1.7.1.tgz#507de680d3fb8c4be1641cc57d6f679f29f178ff"
-  integrity sha1-UH3mgNP7jEvhZBzFfW9nnynxeP8=
+  integrity sha512-Xp9w20GzfOiwabOqi3bH4Gnx85WFwpaWebmaspaDwX9fBISlEnKYoMtIR9bu6OGFIKzt50BRVyXLxRKDZXQ8Hg==
   dependencies:
     JSV ">= 4.0.x"
     nomnom ">= 1.5.x"
@@ -2240,19 +2304,19 @@ jsonlint-lines@1.7.1:
 jsts@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsts/-/jsts-1.3.0.tgz#e93a76f97ac9bda7d4625d9d6470f0d60ac80e45"
-  integrity sha1-6Tp2+XrJvafUYl2dZHDw1grIDkU=
+  integrity sha512-uFcaiZ5ba3Y6lfHNFikk64Kdkfx01iq3GE+K2S2k95uDcJcKxMusMd2RGgYWeS8EeUVX6eadOqwEzwA8yyGOaQ==
 
 kdbush@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0"
   integrity sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==
 
-keyv@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
-  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
+keyv@^4.0.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
+  integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==
   dependencies:
-    json-buffer "3.0.0"
+    json-buffer "3.0.1"
 
 kind-of@^6.0.3:
   version "6.0.3"
@@ -2262,14 +2326,9 @@ kind-of@^6.0.3:
 knockout-mapping@~2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/knockout-mapping/-/knockout-mapping-2.6.0.tgz#052759d01ecf30d4947e8ebe64ad2c82933f06ff"
-  integrity sha1-BSdZ0B7PMNSUfo6+ZK0sgpM/Bv8=
-
-knockout@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/knockout/-/knockout-3.5.0.tgz#6d3e19bf53b1dc4d8de81c97a5ba9672443dc292"
-  integrity sha512-vBUF/IsBDzaejHkNpiquKdc5uPrImXuQ4Mb9lEfNNJ5cyHGI8ThDupR+h3eMFZhfmPE/brfwcIAn/fm0yOvJUg==
+  integrity sha512-Q4dh1RSU/54TRCbZCYCBHC462T64fgnYly6UOyzDA2h8CEgthtN/AL6rXYVmoKYTbRtfvVHyLalKztVOe85Pmw==
 
-knockout@>=2.3.0:
+knockout@>=2.3.0, knockout@~3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/knockout/-/knockout-3.5.1.tgz#62c81e81843bea2008fd23c575edd9ca978e75cf"
   integrity sha512-wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q==
@@ -2277,7 +2336,7 @@ knockout@>=2.3.0:
 knockstrap@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/knockstrap/-/knockstrap-1.3.2.tgz#546b713dc8eee9cf56900f9a772d8e51e67aab06"
-  integrity sha1-VGtxPcju6c9WkA+ady2OUeZ6qwY=
+  integrity sha512-n6Hr+LpywJ6g/lrWfvZrG+FXwkXvfgPAw9ZY9cwIPejv+ZrfeRv8NmfOSr96Zndv4dH0ODu8esXh6OVk6/uYvQ==
   dependencies:
     jquery ">=1.9.0"
     knockout ">=2.3.0"
@@ -2286,7 +2345,7 @@ knockstrap@1.3.2:
 latlon-geohash@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/latlon-geohash/-/latlon-geohash-1.1.0.tgz#7abe15224c4800e3eaecac71c753a20bfb6cbf65"
-  integrity sha1-er4VIkxIAOPq7Kxxx1OiC/tsv2U=
+  integrity sha512-K1zIBU1Wtdw0Uam+Jvu4eC7mq+XBeZ/cTVGRczfE8Wbhb0pZ7+m+gbrlu0sN2i4MkHMxRu/jBc3XKo4wMXxIlg==
 
 leaflet-draw@^1.0.4:
   version "1.0.4"
@@ -2311,12 +2370,12 @@ leaflet@1.6.0:
 lineclip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/lineclip/-/lineclip-1.1.5.tgz#2bf26067d94354feabf91e42768236db5616fd13"
-  integrity sha1-K/JgZ9lDVP6r+R5CdoI221YW/RM=
+  integrity sha512-KlA/wRSjpKl7tS9iRUdlG72oQ7qZ1IlVbVgHwoO10TBR/4gQ86uhKow6nlzMAJJhjCWKto8OeoAzzIzKSmN25A==
 
 lines-and-columns@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
-  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 locate-path@^5.0.0:
   version "5.0.0"
@@ -2325,47 +2384,47 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash.debounce@^4.0.6, lodash.debounce@^4.0.8:
+lodash.debounce@^4.0.6:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.isequal@^4.2.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
 
-lowercase-keys@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
+lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-lowercase-keys@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+lowercase-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
 lt-themify-icons@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/lt-themify-icons/-/lt-themify-icons-1.1.0.tgz#945401d5a7205eff653ad5ef4ce94b912ba98c58"
-  integrity sha1-lFQB1acgXv9lOtXvTOlLkSupjFg=
+  integrity sha512-/9PcTKSq6GdUw+bfzeStjOUgsaOmZEwrxwVCmA9CtORgUgKQNCSxKCwgIpDz81IRgBPG7Ob5DefYqINhULsn1g==
 
 map-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+  integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
 
 map-obj@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz#b91221b542734b9f14256c0132c897c5d7256fd5"
-  integrity sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
+  integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
 mapbox-gl@^1.8.1:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-1.12.0.tgz#7d1c73b1153d7ee219d30d80728d7df079bc7c05"
-  integrity sha512-B3URR4qY9R/Bx+DKqP8qmGCai8IOZYMSZF7ZSvcCZaYTaOYhQQi8ErTEDZtFMOR0ZPj7HFWOkkhl5SqvDfpJpA==
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-1.13.3.tgz#e024829cfc353f6e99275592061d15dfd7f41a71"
+  integrity sha512-p8lJFEiqmEQlyv+DQxFAOG/XPWN0Wp7j/Psq93Zywz7qt9CcUKFYDBOoOEKzqe6gudHVJY8/Bhqw6VDpX2lSBg==
   dependencies:
-    "@mapbox/geojson-rewind" "^0.5.0"
+    "@mapbox/geojson-rewind" "^0.5.2"
     "@mapbox/geojson-types" "^1.0.2"
     "@mapbox/jsonlint-lines-primitives" "^2.0.2"
     "@mapbox/mapbox-gl-supported" "^1.5.0"
@@ -2379,7 +2438,6 @@ mapbox-gl@^1.8.1:
     geojson-vt "^3.2.1"
     gl-matrix "^3.2.1"
     grid-index "^1.1.0"
-    minimist "^1.2.5"
     murmurhash-js "^1.0.0"
     pbf "^3.2.1"
     potpack "^1.0.1"
@@ -2392,7 +2450,7 @@ mapbox-gl@^1.8.1:
 marchingsquares@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/marchingsquares/-/marchingsquares-1.2.0.tgz#36ae2dcc170be576d42579aac3c46da89ab650e6"
-  integrity sha1-Nq4tzBcL5XbUJXmqw8RtqJq2UOY=
+  integrity sha512-qWXJDs9flDf6Ias8eb9kK4z2QL/QlIhXVJgFoADmw59gh3zMInybvMx23hMQ62moMfpRuMJQ3ZZVuHN086x5Pw==
 
 marchingsquares@^1.2.0:
   version "1.3.3"
@@ -2424,25 +2482,30 @@ metismenu@2.7.2:
 mgrs@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/mgrs/-/mgrs-1.0.0.tgz#fb91588e78c90025672395cb40b25f7cd6ad1829"
-  integrity sha1-+5FYjnjJACVnI5XLQLJffNatGCk=
+  integrity sha512-awNbTOqCxK1DBGjalK3xqWIstBZgN6fxsMSiXLs9/spqWkF2pAhb2rrYCFSsr1/tT7PhcDGjZndG8SWYn0byYA==
 
-mime-db@1.44.0:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-types@^2.1.12:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
-    mime-db "1.44.0"
+    mime-db "1.52.0"
 
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
+mimic-response@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
 min-indent@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
@@ -2460,33 +2523,28 @@ minimist-options@^4.0.2:
 minimist@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+  integrity sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==
 
-moment-timezone@0.5.34:
-  version "0.5.34"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c"
-  integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg==
-  dependencies:
-    moment ">= 2.9.0"
+minimist@^1.2.6, minimist@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 moment-timezone@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.4.1.tgz#81f598c3ad5e22cdad796b67ecd8d88d0f5baa06"
-  integrity sha1-gfWYw61eIs2teWtn7NjYjQ9bqgY=
+  integrity sha512-5cNPVUwaVJDCe9JM8m/qz17f9SkaI8rpnRUyDJi2K5HAd6EwhuQ3n5nLclZkNC/qJnomKgQH2TIu70Gy2dxFKA==
   dependencies:
     moment ">= 2.6.0"
 
-"moment@>= 2.6.0", moment@^2.10:
-  version "2.27.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
-  integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
+moment-timezone@~0.5.43:
+  version "0.5.43"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.43.tgz#3dd7f3d0c67f78c23cd1906b9b2137a09b3c4790"
+  integrity sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==
+  dependencies:
+    moment "^2.29.4"
 
-"moment@>= 2.9.0", moment@^2.29.4:
+"moment@>= 2.6.0", moment@^2.10, moment@^2.29.4:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
@@ -2494,19 +2552,19 @@ moment-timezone@^0.4.0:
 monotone-convex-hull-2d@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/monotone-convex-hull-2d/-/monotone-convex-hull-2d-1.0.1.tgz#47f5daeadf3c4afd37764baa1aa8787a40eee08c"
-  integrity sha1-R/Xa6t88Sv03dkuqGqh4ekDu4Iw=
+  integrity sha512-ixQ3qdXTVHvR7eAoOjKY8kGxl9YjOFtzi7qOjwmFFPfBqZHVOjUFOBy/Dk9dusamRSPJe9ggyfSypRbs0Bl8BA==
   dependencies:
     robust-orientation "^1.1.3"
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
 murmurhash-js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51"
-  integrity sha1-sGJ44h/Gw3+lMTcysEEry2rhX1E=
+  integrity sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==
 
 nanoid@^2.0.1:
   version "2.1.11"
@@ -2516,7 +2574,7 @@ nanoid@^2.0.1:
 "nomnom@>= 1.5.x":
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
-  integrity sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=
+  integrity sha512-5s0JxqhDx9/rksG2BTMVN1enjWSvPidpoSgViZU4ZXULyTe+7jxcCRLB6f42Z0l1xYJpleCBtSyY6Lwg3uu5CQ==
   dependencies:
     chalk "~0.4.0"
     underscore "~1.6.0"
@@ -2531,14 +2589,10 @@ normalize-package-data@^2.5.0:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-url@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
-  dependencies:
-    prepend-http "^2.0.0"
-    query-string "^5.0.1"
-    sort-keys "^2.0.0"
+normalize-url@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
 nouislider@11.0.3:
   version "11.0.3"
@@ -2548,55 +2602,32 @@ nouislider@11.0.3:
 numeral@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/numeral/-/numeral-2.0.6.tgz#4ad080936d443c2561aed9f2197efffe25f4e506"
-  integrity sha1-StCAk21EPCVhrtnyGX7//iX05QY=
-
-object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-inspect@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
+  integrity sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==
 
 object-is@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
-  integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
+  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.5"
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-p-cancelable@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
-  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+    wrappy "1"
 
-p-is-promise@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
+p-cancelable@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
 
 p-limit@^2.2.0:
   version "2.3.0"
@@ -2612,22 +2643,15 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-timeout@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
-  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
-  dependencies:
-    p-finally "^1.0.0"
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 parse-json@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
-  integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
@@ -2639,12 +2663,12 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-parse@^1.0.6:
+path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-pbf@^3.0.5, pbf@^3.2.1:
+pbf@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.2.1.tgz#b4c1b9e72af966cd82c6531691115cc0409ffe2a"
   integrity sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==
@@ -2652,15 +2676,10 @@ pbf@^3.0.5, pbf@^3.2.1:
     ieee754 "^1.1.12"
     resolve-protobuf-schema "^2.1.0"
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
 polygonize@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/polygonize/-/polygonize-1.0.1.tgz#51fb7040914be0fbc43b0bd54d421d75fc2ae7a6"
-  integrity sha1-UftwQJFL4PvEOwvVTUIddfwq56Y=
+  integrity sha512-vVkeF4ju+QEuutzMwnt4t1oGt8CbbfyszSU2t+UTzupfsOFH3IWTINHuY2+Lwz4D+SufwlLIJwHd5XdxMO9XDw==
   dependencies:
     "@turf/envelope" "^4.3.0"
     "@turf/helpers" "^4.3.0"
@@ -2669,14 +2688,9 @@ polygonize@1.0.1:
     "@turf/meta" "^4.3.0"
 
 potpack@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.1.tgz#d1b1afd89e4c8f7762865ec30bd112ab767e2ebf"
-  integrity sha512-15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw==
-
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.2.tgz#23b99e64eb74f5741ffe7656b5b5c4ddce8dfc14"
+  integrity sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ==
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
@@ -2684,32 +2698,36 @@ process-nextick-args@~2.0.0:
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 proj4@^2.3.15:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/proj4/-/proj4-2.6.2.tgz#4665d7cbc30fd356375007c2fed53b07dbda1d67"
-  integrity sha512-Pn0+HZtXb4JzuN8RR0VM7yyseegiYHbXkF+2FOdGpzRojcZ1BTjWxOh7qfp2vH0EyLu8pvcrhLxidwzgyUy/Gw==
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/proj4/-/proj4-2.9.0.tgz#1b61db8c998313f80e2514609b339fb2d28cbb82"
+  integrity sha512-BoDXEzCVnRJVZoOKA0QHTFtYoE8lUxtX1jST38DJ8U+v1ixY70Kpwi0Llu6YqSWEH2xqu4XMEBNGcgeRIEywoA==
   dependencies:
     mgrs "1.0.0"
-    wkt-parser "^1.2.4"
+    wkt-parser "^1.3.1"
 
 protocol-buffers-schema@^3.3.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.4.0.tgz#2f0ea31ca96627d680bf2fefae7ebfa2b6453eae"
-  integrity sha512-G/2kcamPF2S49W5yaMGdIpkG6+5wZF0fzBteLKgEHjbNzqjZQ85aAs1iJGto31EJaSTkNvHs5IXuHSaTLWBAiA==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03"
+  integrity sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==
 
-query-string@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
-    decode-uri-component "^0.2.0"
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
 
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
+quick-lru@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
 quickselect@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2"
@@ -2746,10 +2764,10 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-readable-stream@^2.0.0, readable-stream@^2.2.2:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+readable-stream@^2.2.2:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -2759,15 +2777,6 @@ readable-stream@^2.0.0, readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.2:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -2777,38 +2786,39 @@ redent@^3.0.0:
     strip-indent "^3.0.0"
 
 regexp.prototype.flags@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
-  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
+  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    functions-have-names "^1.2.3"
 
 repeat-string@^1.5.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-replace-ext@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
 requirejs-plugins@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/requirejs-plugins/-/requirejs-plugins-1.0.2.tgz#693b5589d97f8598462fc71826353262aafda836"
-  integrity sha1-aTtVidl/hZhGL8cYJjUyYqr9qDY=
+  integrity sha512-bX1vGnjDd1iIod3hst47oM/Nv9JiYw4qodWNKgyeQw5ahzSvPI3j1K6hMcK0HtiGRKxebCf+QUrtWzbrZtzQog==
 
-requirejs-text@2.0.12:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/requirejs-text/-/requirejs-text-2.0.12.tgz#d7915d50e30ef355a53a8123f12a5e760a601eb8"
-  integrity sha1-15FdUOMO81WlOoEj8SpedgpgHrg=
+requirejs-text@~2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/requirejs-text/-/requirejs-text-2.0.16.tgz#b6f3e20689aa998e36641bc4f8bd11b7964ac872"
+  integrity sha512-XrzjeTb1pwzIWmkz8qnUiM20gENgiwB+66IciNuziwlaPAJsYQsQPSYyQ1kD4tGKGZxTisIfDbOHk02DpI/76Q==
 
 requirejs@~2.3.2:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.6.tgz#e5093d9601c2829251258c0b9445d4d19fa9e7c9"
   integrity sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==
 
+resolve-alpn@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
 resolve-protobuf-schema@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz#9ca9a9e69cf192bbdaf1006ec1973948aa4a3758"
@@ -2817,23 +2827,25 @@ resolve-protobuf-schema@^2.1.0:
     protocol-buffers-schema "^3.3.1"
 
 resolve@^1.10.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
-  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
   dependencies:
-    path-parse "^1.0.6"
+    is-core-module "^2.11.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
 
-responselike@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+responselike@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
+  integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
   dependencies:
-    lowercase-keys "^1.0.0"
+    lowercase-keys "^2.0.0"
 
 robust-orientation@^1.1.2, robust-orientation@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/robust-orientation/-/robust-orientation-1.1.3.tgz#daff5b00d3be4e60722f0e9c0156ef967f1c2049"
-  integrity sha1-2v9bANO+TmByLw6cAVbvln8cIEk=
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/robust-orientation/-/robust-orientation-1.2.1.tgz#f6c2b00a5df5f1cb9597be63a45190f273899361"
+  integrity sha512-FuTptgKwY6iNuU15nrIJDLjXzCChWB+T4AvksRtwPS/WZ3HuP1CElCm1t+OBfgQKfWbtZIawip+61k7+buRKAg==
   dependencies:
     robust-scale "^1.0.2"
     robust-subtract "^1.0.0"
@@ -2843,7 +2855,7 @@ robust-orientation@^1.1.2, robust-orientation@^1.1.3:
 robust-scale@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/robust-scale/-/robust-scale-1.0.2.tgz#775132ed09542d028e58b2cc79c06290bcf78c32"
-  integrity sha1-d1Ey7QlULQKOWLLMecBikLz3jDI=
+  integrity sha512-jBR91a/vomMAzazwpsPTPeuTPPmWBacwA+WYGNKcRGSh6xweuQ2ZbjRZ4v792/bZOhRKXRiQH0F48AvuajY0tQ==
   dependencies:
     two-product "^1.0.2"
     two-sum "^1.0.0"
@@ -2851,27 +2863,22 @@ robust-scale@^1.0.2:
 robust-subtract@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/robust-subtract/-/robust-subtract-1.0.0.tgz#e0b164e1ed8ba4e3a5dda45a12038348dbed3e9a"
-  integrity sha1-4LFk4e2LpOOl3aRaEgODSNvtPpo=
+  integrity sha512-xhKUno+Rl+trmxAIVwjQMiVdpF5llxytozXJOdoT4eTIqmqsndQqFb1A0oiW3sZGlhMRhOi6pAD4MF1YYW6o/A==
 
 robust-sum@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/robust-sum/-/robust-sum-1.0.0.tgz#16646e525292b4d25d82757a286955e0bbfa53d9"
-  integrity sha1-FmRuUlKStNJdgnV6KGlV4Lv6U9k=
+  integrity sha512-AvLExwpaqUqD1uwLU6MwzzfRdaI6VEZsyvQ3IAQ0ZJ08v1H+DTyqskrf2ZJyh0BDduFVLN7H04Zmc+qTiahhAw==
 
 rw@1, rw@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
-  integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
+  integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
 
 rw@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/rw/-/rw-0.1.4.tgz#4903cbd80248ae0ede685bf58fd236a7a9b29a3e"
-  integrity sha1-SQPL2AJIrg7eaFv1j9I2p6mymj4=
-
-safe-buffer@^5.1.1, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+  integrity sha512-vSj3D96kMcjNyqPcp65wBRIDImGSrUuMxngNNxvw8MQaO+aQ6llzRPH7XcJy5zrpb3wU++045+Uz/IDIM684iw==
 
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
@@ -2886,17 +2893,17 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
 select2@3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.1.tgz#f2819489bbc65fd6d328be72bbe2b95dd7e87cfe"
-  integrity sha1-8oGUibvGX9bTKL5yu+K5XdfofP4=
+  integrity sha512-IFX3UFPpPyK1I1Kuw1R1x+upMyNAZbMlkFhiTnRCRR7ii0KU1brmJMLa3GZcrMWCHiQlm0eKqb6i4XO4pqOrGQ==
 
 "semver@2 || 3 || 4 || 5":
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 simplepolygon@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/simplepolygon/-/simplepolygon-1.2.1.tgz#48250a6a853275e96e42c7105f507da00dc67d64"
-  integrity sha1-SCUKaoUydeluQscQX1B9oA3GfWQ=
+  integrity sha512-9XAZs9bo14woAWSFRMMOLHk3nFn4nudLDV2kYL/nDWYC2Gl7aEmhKtS0+nb5w4bXlFsZU5clRA0rrEnGRo1nnQ==
   dependencies:
     "@turf/area" "^3.13.0"
     "@turf/helpers" "^3.13.0"
@@ -2909,7 +2916,7 @@ simplepolygon@1.2.1:
 simplicial-complex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/simplicial-complex/-/simplicial-complex-1.0.0.tgz#6c33a4ed69fcd4d91b7bcadd3b30b63683eae241"
-  integrity sha1-bDOk7Wn81Nkbe8rdOzC2NoPq4kE=
+  integrity sha512-mHauIKSOy3GquM5VnYEiu7eP5y4A8BiaN9ezUUgyYFz1k68PqDYcyaH3kenp2cyvWZE96QKE3nrxYw65Allqiw==
   dependencies:
     bit-twiddle "^1.0.0"
     union-find "^1.0.0"
@@ -2919,17 +2926,10 @@ simplify-js@^1.2.1:
   resolved "https://registry.yarnpkg.com/simplify-js/-/simplify-js-1.2.4.tgz#7aab22d6df547ffd40ef0761ccd82b75287d45c7"
   integrity sha512-vITfSlwt7h/oyrU42R83mtzFpwYk3+mkH9bOHqq/Qw6n8rtR7aE3NZQ5fbcyCUVVmuMJR6ynsAhOfK2qoah8Jg==
 
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
+  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -2948,14 +2948,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
-
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+  version "3.0.13"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
+  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
 
 string-width@^2.0.0:
   version "2.1.1"
@@ -2965,29 +2960,6 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string.prototype.trimend@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
-string.prototype.trimstart@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -2998,14 +2970,14 @@ string_decoder@~1.1.1:
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-ansi@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
-  integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=
+  integrity sha512-behete+3uqxecWlDAm5lmskaSaISA+ThQ4oNNBDTBJt0x2ppR6IPqfZNuj6BLaLJ/Sji4TPZlcRyOis8wXQTLg==
 
 strip-indent@^3.0.0:
   version "3.0.0"
@@ -3020,17 +2992,17 @@ subtag@^0.5.0:
   integrity sha512-CaIBcTSb/nyk4xiiSOtZYz1B+F12ZxW8NEp54CdT+84vmh/h4sUnHGC6+KQXUfED8u22PQjCYWfZny8d2ELXwg==
 
 suggestions@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/suggestions/-/suggestions-1.7.0.tgz#63965229c8082e72cfeb08ad426a6f725ab036ba"
-  integrity sha512-Px+gellrEQUkgM3Lc0Umnz4JIammE0CLcp+7lbNQH/wqnD0u/N1bOXytNOR3Ap1dIZDHE8lYMuwd60jMO6BPDw==
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/suggestions/-/suggestions-1.7.1.tgz#2fefcbde8967353056d1d6eaed891b46d98a7e5c"
+  integrity sha512-gl5YPAhPYl07JZ5obiD9nTZsg4SyZswAQU/NNtnYiSnFkI3+ZHuXAiEsYm7AaZ71E0LXSFaGVaulGSWN3Gd71A==
   dependencies:
     fuzzy "^0.1.1"
     xtend "^4.0.0"
 
 supercluster@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.0.tgz#f0a457426ec0ab95d69c5f03b51e049774b94479"
-  integrity sha512-LDasImUAFMhTqhK+cUXfy9C2KTUqJ3gucLjmNLNFmKWOnDUBxLFLH9oKuXOTCLveecmxh8fbk8kgh6Q0gsfe2w==
+  version "7.1.5"
+  resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.5.tgz#65a6ce4a037a972767740614c19051b64b8be5a3"
+  integrity sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==
   dependencies:
     kdbush "^3.0.0"
 
@@ -3041,10 +3013,10 @@ supports-color@^5.0.0, supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-timed-out@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 tinyqueue@^2.0.3:
   version "2.0.3"
@@ -3066,9 +3038,9 @@ topojson-server@^3.0.0:
     commander "2"
 
 traverse@~0.6.6:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
-  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
+  version "0.6.7"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.7.tgz#46961cd2d57dd8706c36664acde06a248f1173fe"
+  integrity sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==
 
 trim-newlines@^3.0.0:
   version "3.0.1"
@@ -3078,17 +3050,17 @@ trim-newlines@^3.0.0:
 twitter-bootstrap-3.0.0@~3:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/twitter-bootstrap-3.0.0/-/twitter-bootstrap-3.0.0-3.0.0.tgz#30a24297b48373f93cd9abe10fd9924415c3d17a"
-  integrity sha1-MKJCl7SDc/k82avhD9mSRBXD0Xo=
+  integrity sha512-i5vrzu+Wl6PGKraJAaPx6nDUTS/v/E+oqS/SUtsfp259HD85yBK/ZROrU8dG0wQatzG4rmFmjUNbIcHH6Yv8yA==
 
 two-product@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/two-product/-/two-product-1.0.2.tgz#67d95d4b257a921e2cb4bd7af9511f9088522eaa"
-  integrity sha1-Z9ldSyV6kh4stL16+VEfkIhSLqo=
+  integrity sha512-vOyrqmeYvzjToVM08iU52OFocWT6eB/I5LUWYnxeAPGXAhAxXYU/Yr/R2uY5/5n4bvJQL9AQulIuxpIsMoT8XQ==
 
 two-sum@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/two-sum/-/two-sum-1.0.0.tgz#31d3f32239e4f731eca9df9155e2b297f008ab64"
-  integrity sha1-MdPzIjnk9zHsqd+RVeKyl/AIq2Q=
+  integrity sha512-phP48e8AawgsNUjEY2WvoIWqdie8PoiDZGxTDv70LDr01uX5wLEQbOgSP7Z/B6+SW5oLtbe8qaYX2fKJs3CGTw==
 
 type-fest@^0.13.1:
   version "0.13.1"
@@ -3108,27 +3080,22 @@ type-fest@^0.8.1:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-underscore@1.13.4:
-  version "1.13.4"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee"
-  integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ==
+  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-underscore@>=1.8.3:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.11.0.tgz#dd7c23a195db34267186044649870ff1bab5929e"
-  integrity sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw==
+underscore@>=1.8.3, underscore@~1.13.6:
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
+  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
 
 underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
-  integrity sha1-izixDKze9jM3uLJOT/htRa6lKag=
+  integrity sha512-z4o1fvKUojIWh9XuaVLUDdf86RQiq13AC1dmHbTpoyuu+bquHms76v16CjycCbec87J7z0k//SiQVk0sMdFmpQ==
 
 union-find@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/union-find/-/union-find-1.0.2.tgz#292bac415e6ad3a89535d237010db4a536284e58"
-  integrity sha1-KSusQV5q06iVNdI3AQ20pTYoTlg=
+  integrity sha512-wFA9bMD/40k7ZcpKVXfu6X1qD3ri5ryO8HUsuA1RnxPCQl66Mu6DgkxyR+XNnd+osD0aLENixcJVFj+uf+O4gw==
 
 unist-util-stringify-position@^2.0.0:
   version "2.0.3"
@@ -3137,22 +3104,10 @@ unist-util-stringify-position@^2.0.0:
   dependencies:
     "@types/unist" "^2.0.2"
 
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
-  dependencies:
-    prepend-http "^2.0.0"
-
-url-to-options@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
-  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 uuidjs@^3.3.0:
   version "3.6.2"
@@ -3198,24 +3153,23 @@ vfile-statistics@^1.1.0:
   integrity sha512-lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA==
 
 vfile@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz#26c78ac92eb70816b01d4565e003b7e65a2a0e01"
-  integrity sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
+  integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
   dependencies:
     "@types/unist" "^2.0.0"
     is-buffer "^2.0.0"
-    replace-ext "1.0.0"
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
 vt-pbf@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.1.tgz#b0f627e39a10ce91d943b898ed2363d21899fb82"
-  integrity sha512-pHjWdrIoxurpmTcbfBWXaPwSmtPAHS105253P1qyEfSTV2HJddqjM+kIHquaT/L6lVJIk9ltTGc0IxR/G47hYA==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac"
+  integrity sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==
   dependencies:
     "@mapbox/point-geometry" "0.1.0"
     "@mapbox/vector-tile" "^1.3.1"
-    pbf "^3.0.5"
+    pbf "^3.2.1"
 
 webcola@^3.4.0:
   version "3.4.0"
@@ -3230,12 +3184,17 @@ webcola@^3.4.0:
 wgs84@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/wgs84/-/wgs84-0.0.0.tgz#34fdc555917b6e57cf2a282ed043710c049cdc76"
-  integrity sha1-NP3FVZF7blfPKigu0ENxDASc3HY=
+  integrity sha512-ANHlY4Rb5kHw40D0NJ6moaVfOCMrp9Gpd1R/AIQYg2ko4/jzcJ+TVXYYF6kXJqQwITvEZP4yEthjM7U6rYlljQ==
 
-wkt-parser@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.2.4.tgz#e42ba7b96f13aef82a2da9056e2d87da0fec5393"
-  integrity sha512-ZzKnc7ml/91fOPh5bANBL4vUlWPIYYv11waCtWTkl2TRN+LEmBg60Q1MA8gqV4hEp4MGfSj9JiHz91zw/gTDXg==
+wkt-parser@^1.3.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.3.3.tgz#46b4e3032dd9c86907f7e630b57e3c6ea2bb772b"
+  integrity sha512-ZnV3yH8/k58ZPACOXeiHaMuXIiaTk1t0hSUVisbO0t4RjA5wPpUytcxeyiN2h+LZRrmuHIh/1UlrR9e7DHDvTw==
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 xtend@^4.0.0, xtend@^4.0.1:
   version "4.0.2"

From 76e749f3a52cc0b01c24e9557ec5cc7a0d020b6a Mon Sep 17 00:00:00 2001
From: khodgkinson <53860784+khodgkinson-he@users.noreply.github.com>
Date: Mon, 17 Jul 2023 11:28:21 +0100
Subject: [PATCH 25/44] 9561 Json-Ld fix : Omit Edge from Null Domain

---
 .../app/utils/data_management/resources/formats/rdffile.py   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arches/app/utils/data_management/resources/formats/rdffile.py b/arches/app/utils/data_management/resources/formats/rdffile.py
index 256a4d62d65..a95ef7bbdf3 100644
--- a/arches/app/utils/data_management/resources/formats/rdffile.py
+++ b/arches/app/utils/data_management/resources/formats/rdffile.py
@@ -149,6 +149,11 @@ def add_edge_to_graph(graph, domainnode, rangenode, edge, tile, graph_info):
             # Nothing to do here
             if pkg["r_uri"] is None and pkg["range_tile_data"] is None:
                 return
+            
+            # JSON-LD fails assert if domain node empty while range node has data. 
+            # Unknown!=Undefined, but reasonable substitution to omit edge from null domain.
+            if pkg["d_uri"] is None:
+                return
 
             # FIXME:  Why is this not in datatype.to_rdf()
 

From 77fc6cce801672e2cf08fd6054342a69d408dcc0 Mon Sep 17 00:00:00 2001
From: Kingsley <53860784+khodgkinson-he@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:49:27 +0100
Subject: [PATCH 26/44] Update rdffile.py as per PR suggestion

Informative logger msg added as per CHiatt's excellent suggestion! ^_^
---
 arches/app/utils/data_management/resources/formats/rdffile.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arches/app/utils/data_management/resources/formats/rdffile.py b/arches/app/utils/data_management/resources/formats/rdffile.py
index a95ef7bbdf3..a56950e08e6 100644
--- a/arches/app/utils/data_management/resources/formats/rdffile.py
+++ b/arches/app/utils/data_management/resources/formats/rdffile.py
@@ -152,7 +152,8 @@ def add_edge_to_graph(graph, domainnode, rangenode, edge, tile, graph_info):
             
             # JSON-LD fails assert if domain node empty while range node has data. 
             # Unknown!=Undefined, but reasonable substitution to omit edge from null domain.
-            if pkg["d_uri"] is None:
+            if pkg["d_uri"] is None and pkg["range_tile_data"]:
+                self.logger.warn(_("Unable to return range value because domain is None, re https://github.com/archesproject/arches/pull/9783/files"))
                 return
 
             # FIXME:  Why is this not in datatype.to_rdf()

From 1940bc9f85cf9a7f5a3ebbd7f25a7dd554d878ff Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Tue, 18 Jul 2023 11:00:24 -0700
Subject: [PATCH 27/44] Apply fix to unpreloaded data

---
 arches/app/views/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/views/api.py b/arches/app/views/api.py
index 816119e8ee1..86a7e96f407 100644
--- a/arches/app/views/api.py
+++ b/arches/app/views/api.py
@@ -1235,7 +1235,7 @@ def get(self, request, resourceid):
         template = models.ReportTemplate.objects.get(pk=graph.template_id)
 
         if not template.preload_resource_data:
-            return JSONResponse({"template": template, "report_json": resource.to_json(compact=compact, version=version)})
+            return JSONResponse({"template": template, "report_json": resource.to_json(compact=compact, version=version, user=request.user, perm=perm)})
 
         resp = {
             "datatypes": models.DDataType.objects.all(),

From 9134337fec286302bc97e37a960f17df79679ba2 Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Tue, 18 Jul 2023 17:58:17 -0700
Subject: [PATCH 28/44] Add support for xlsx file, #8469

---
 arches/app/etl_modules/branch_csv_importer.py                | 5 +++++
 arches/app/templates/javascript.htm                          | 2 +-
 .../views/components/etl_modules/branch-csv-importer.htm     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arches/app/etl_modules/branch_csv_importer.py b/arches/app/etl_modules/branch_csv_importer.py
index 6720cd25787..34230bbe99a 100644
--- a/arches/app/etl_modules/branch_csv_importer.py
+++ b/arches/app/etl_modules/branch_csv_importer.py
@@ -268,6 +268,11 @@ def read(self, request):
                             result["summary"]["files"][file.filename] = {"size": (self.filesize_format(file.file_size))}
                             result["summary"]["cumulative_excel_files_size"] = self.cumulative_excel_files_size
                         default_storage.save(os.path.join(self.temp_dir, file.filename), File(zip_ref.open(file)))
+        elif content.name.split(".")[-1] == "xlsx":
+            self.cumulative_excel_files_size += content.size
+            result["summary"]["files"][content.name] = {"size": (self.filesize_format(content.size))}
+            result["summary"]["cumulative_excel_files_size"] = self.cumulative_excel_files_size
+            default_storage.save(os.path.join(self.temp_dir, content.name), File(content))
         return {"success": result, "data": result}
 
     def start(self, request):
diff --git a/arches/app/templates/javascript.htm b/arches/app/templates/javascript.htm
index 535aaca9988..e6fe2a9b10f 100644
--- a/arches/app/templates/javascript.htm
+++ b/arches/app/templates/javascript.htm
@@ -712,7 +712,7 @@
         download-templates='{% trans "Download Templates" as downloadTemplates %} "{{ downloadTemplates|escapejs }}"'
         select-template='{% trans "Select Template" as selectTemplate %} "{{ selectTemplate|escapejs }}"'
         upload-zip-file='{% trans "Upload .zip File" as uploadZipFile %} "{{ uploadZipFile|escapejs }}"'
-        upload-your-zip-file='{% trans "Upload Your .zip File" as uploadYourZipFile %} "{{ uploadYourZipFile|escapejs }}"'
+        upload-your-xlsx-zip-file='{% trans "Upload Your .xlsx or .zip File" as uploadYourXlsxZipFile %} "{{ uploadYourXlsxZipFile|escapejs }}"'
         branch-excel='{% trans "Branch Excel" as branchExcel %} "{{ branchExcel|escapejs }}"'
         file-upload-summary='{% trans "File Upload Summary" as fileUploadSummary %} "{{ fileUploadSummary|escapejs }}"'
         file='{% trans "File" as file %} "{{ file|escapejs }}"'
diff --git a/arches/app/templates/views/components/etl_modules/branch-csv-importer.htm b/arches/app/templates/views/components/etl_modules/branch-csv-importer.htm
index 59cb764e513..4440ee6d667 100644
--- a/arches/app/templates/views/components/etl_modules/branch-csv-importer.htm
+++ b/arches/app/templates/views/components/etl_modules/branch-csv-importer.htm
@@ -50,7 +50,7 @@ <h4>
                     <span><i style="color: #000" class="fa fa-cloud-upload r-select-icon"></i></span>
                 </div> 
                 <h2>
-                    <span data-bind="text: $root.translations.uploadYourZipFile"></span>
+                    <span data-bind="text: $root.translations.uploadYourXlsxZipFile"></span>
                 </h2>
                 <h4>
                     <span data-bind="text: $root.translations.dragAndDropFilesOnPanel"></span>

From d95bc0d27eafcd22635a72432c93c92b1b29dcc8 Mon Sep 17 00:00:00 2001
From: SDScandrettKint <samuel.scandrett@k-int.co.uk>
Date: Wed, 19 Jul 2023 16:51:13 +0100
Subject: [PATCH 29/44] adding speechmark conversion

---
 arches/app/models/fields/i18n.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arches/app/models/fields/i18n.py b/arches/app/models/fields/i18n.py
index a350141bb0d..43063f6d7a8 100644
--- a/arches/app/models/fields/i18n.py
+++ b/arches/app/models/fields/i18n.py
@@ -22,6 +22,10 @@ def _parse(self, value, lang, use_nulls):
         ret = {}
 
         if isinstance(value, str) and value != "null":
+            # fix for issue #9623 - using double quotation marks in i18n input
+            if value.startswith('"') and value.endswith('"'):
+                value = value.replace('"', r'\"')
+
             try:
                 ret = json.loads(value)
             except:

From 03ec37bf744b3d52eb8dc02dc6ed83fb43c85472 Mon Sep 17 00:00:00 2001
From: SDScandrettKint <samuel.scandrett@k-int.co.uk>
Date: Wed, 19 Jul 2023 17:00:44 +0100
Subject: [PATCH 30/44] replacing / with - in create package

---
 arches/management/commands/packages.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arches/management/commands/packages.py b/arches/management/commands/packages.py
index 1a367b84640..7cb7709d049 100644
--- a/arches/management/commands/packages.py
+++ b/arches/management/commands/packages.py
@@ -400,7 +400,8 @@ def export_resource_graphs(self, dest_dir, force=False):
                 output_graph = {"graph": [graph], "metadata": system_metadata()}
                 graph_json = JSONSerializer().serialize(output_graph, indent=4)
                 if graph["graphid"] not in existing_resource_graphs:
-                    output_file = os.path.join(dest_dir, str(I18n_String(graph["name"])) + ".json")
+                    graph_name = str(I18n_String(graph["name"])).replace("/", "-")
+                    output_file = os.path.join(dest_dir, graph_name + ".json")
                     with open(output_file, "w") as f:
                         print("writing", output_file)
                         f.write(graph_json)

From 679f509f4751f68d3890a49a7029a11b94206c05 Mon Sep 17 00:00:00 2001
From: Alexei Peters <apeters@fargeo.com>
Date: Wed, 19 Jul 2023 16:56:26 -0700
Subject: [PATCH 31/44] slight improvement on how we handle for quoted strings
 in i18n strings, re #9623

---
 arches/app/models/fields/i18n.py  | 16 ++++++++++++----
 tests/localization/field_tests.py | 17 +++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/arches/app/models/fields/i18n.py b/arches/app/models/fields/i18n.py
index 43063f6d7a8..fc3d6653d5c 100644
--- a/arches/app/models/fields/i18n.py
+++ b/arches/app/models/fields/i18n.py
@@ -22,12 +22,20 @@ def _parse(self, value, lang, use_nulls):
         ret = {}
 
         if isinstance(value, str) and value != "null":
-            # fix for issue #9623 - using double quotation marks in i18n input
-            if value.startswith('"') and value.endswith('"'):
-                value = value.replace('"', r'\"')
-
             try:
                 ret = json.loads(value)
+
+                # the following is a fix for issue #9623 - using double quotation marks in i18n input
+                # re https://github.com/archesproject/arches/issues/9623
+                # the reason we have to do this next check is that we assumed that if the 
+                # json.loads method doesn't fail we have a python dict.  That's usually 
+                # true unless you have a simple string wrapped in quotes 
+                # eg: '"hello world"' rather than simply 'hello world'
+                # the quoted string loads without error but is not a dict
+                # hence the need for this check
+                if not isinstance(ret, dict):
+                    ret = {}
+                    raise Exception("value is not a json object")
             except:
                 ret[lang] = value
                 self.value_is_primitive = True
diff --git a/tests/localization/field_tests.py b/tests/localization/field_tests.py
index 4265222a98b..a60608790dc 100644
--- a/tests/localization/field_tests.py
+++ b/tests/localization/field_tests.py
@@ -183,6 +183,23 @@ def test_i18n_text_field_data_consistency_before_and_after_save(self):
         self.assertEqual(str(m.name), "Marco")
         self.assertEqual(m.name.raw_value, {"en": "Marco"})
 
+    def test_quoted_string_i18n_text_field_data_consistency_before_and_after_save(self):
+        # re https://github.com/archesproject/arches/issues/9623
+        translation.activate("en")
+        m = self.LocalizationTestModel()
+        m.name = "\"Hello World\""
+        m.id = 11
+        self.assertEqual(str(m.name),"\"Hello World\"")
+        m.save()
+
+        # test that post save everything is the same
+        self.assertEqual(str(m.name), "\"Hello World\"")
+
+        # test that the object retrieved from the database is the same
+        m = self.LocalizationTestModel.objects.get(pk=11)
+        self.assertEqual(str(m.name), "\"Hello World\"")
+        self.assertEqual(m.name.raw_value, {"en": "\"Hello World\""})
+
     def test_equality(self):
         value = I18n_String("toast")
         self.assertEqual(value, "toast")

From d69c385882f4bc136496a9a067075d56449ee0c0 Mon Sep 17 00:00:00 2001
From: Alexei Peters <apeters@fargeo.com>
Date: Thu, 20 Jul 2023 13:48:19 -0700
Subject: [PATCH 32/44] standarize the way triggers are managed in the bulk
 editor, re #9670

---
 arches/app/etl_modules/base_import_module.py  |  3 +--
 .../9670_improve_bulk_load_performance.py     | 26 -------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/arches/app/etl_modules/base_import_module.py b/arches/app/etl_modules/base_import_module.py
index 95e06441068..d040efe8ba4 100644
--- a/arches/app/etl_modules/base_import_module.py
+++ b/arches/app/etl_modules/base_import_module.py
@@ -67,8 +67,7 @@ def save_to_tiles(self, loadid, finalize_import=True, multiprocessing=True):
                 }
             finally:
                 try:
-                    cursor.execute("""alter table tiles enable trigger __arches_check_excess_tiles_trigger;""")
-                    cursor.execute("""alter table tiles enable trigger __arches_trg_update_spatial_attributes;""")
+                    cursor.execute("""CALL __arches_complete_bulk_load();""")
 
                     if finalize_import:
                         cursor.execute("""SELECT __arches_refresh_spatial_views();""")
diff --git a/arches/app/models/migrations/9670_improve_bulk_load_performance.py b/arches/app/models/migrations/9670_improve_bulk_load_performance.py
index a654ad55fa8..c5587daa5f9 100644
--- a/arches/app/models/migrations/9670_improve_bulk_load_performance.py
+++ b/arches/app/models/migrations/9670_improve_bulk_load_performance.py
@@ -14,32 +14,6 @@ class Migration(migrations.Migration):
             BEGIN
                 alter table tiles enable trigger __arches_check_excess_tiles_trigger;
                 alter table tiles enable trigger __arches_trg_update_spatial_attributes;
-
-                if (not __arches_refresh_spatial_views()) then
-                    Raise EXCEPTION 'Unable to refresh spatial views';
-                end if;
-
-            with cardinality_violations as (SELECT t.resourceinstanceid,
-                                                    t.nodegroupid,
-                                                    COALESCE(t.parenttileid::text, '') parent_tileid,
-                                                    count(*)
-                                            FROM tiles t,
-                                                    node_groups ng
-                                            WHERE t.nodegroupid = ng.nodegroupid
-                                                AND ng.cardinality = '1'
-                                            group by t.resourceinstanceid, t.nodegroupid, parent_tileid
-                                            having count(*) > 1
-                                            LIMIT 1)
-            select count(*)
-            into cardinality_violations
-            from cardinality_violations;
-
-                if (cardinality_violations > 0) then
-                    Raise Exception 'Cardinality violations found. Run `%` to list violations',
-                        'select * from __arches_get_tile_cardinality_violations()';
-                else
-                    Raise Notice 'No cardinality violations found';
-                end if;
             END
         $$
         language plpgsql;

From 8277166f8201bf59cadf2812b23145c40b6636ff Mon Sep 17 00:00:00 2001
From: Alexei Peters <apeters@fargeo.com>
Date: Thu, 20 Jul 2023 13:48:52 -0700
Subject: [PATCH 33/44] improve responsiveness of the UI, re #9670

---
 .../js/views/components/etl_modules/base-bulk-string-editor.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arches/app/media/js/views/components/etl_modules/base-bulk-string-editor.js b/arches/app/media/js/views/components/etl_modules/base-bulk-string-editor.js
index 2bd6764e97c..cc71d760d0b 100644
--- a/arches/app/media/js/views/components/etl_modules/base-bulk-string-editor.js
+++ b/arches/app/media/js/views/components/etl_modules/base-bulk-string-editor.js
@@ -191,9 +191,8 @@ define([
             }
 
             self.addAllFormData();
-            self.loading(true);
+            params.activeTab("import");
             self.submit('write').then(data => {
-                params.activeTab("import");
                 console.log(data.result);
             }).fail( function(err) {
                 self.alert(

From aab54e83d61a6f9c716a3e8c50e6c0296b843858 Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Thu, 20 Jul 2023 14:09:22 -0700
Subject: [PATCH 34/44] Ensure pytz and tzdata are at version compatible with
 Celery, re #9797

---
 arches/install/requirements.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arches/install/requirements.txt b/arches/install/requirements.txt
index ad7ffc5e9ef..a89ff160ad4 100644
--- a/arches/install/requirements.txt
+++ b/arches/install/requirements.txt
@@ -33,4 +33,6 @@ defusedxml==0.7.1
 requests-oauthlib==1.3.1
 pyjwt>=2.0.0,<3
 pyjwt[crypto]
-semantic-version==2.10.0
\ No newline at end of file
+semantic-version==2.10.0
+tzdata==2023.3
+pytz==2023.3
\ No newline at end of file

From 131d69d0a2acd5bb6a6b5113a4150fa479282e51 Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Thu, 20 Jul 2023 15:33:34 -0700
Subject: [PATCH 35/44] fixes migration order #9801

---
 .../app/models/migrations/9670_improve_bulk_load_performance.py | 2 +-
 .../models/migrations/9746_related_resource_post_save_bug.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arches/app/models/migrations/9670_improve_bulk_load_performance.py b/arches/app/models/migrations/9670_improve_bulk_load_performance.py
index c5587daa5f9..088e7eea19a 100644
--- a/arches/app/models/migrations/9670_improve_bulk_load_performance.py
+++ b/arches/app/models/migrations/9670_improve_bulk_load_performance.py
@@ -3,7 +3,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("models", "9477_fix_for_spatial_view_dbf_function_edtf_displaying_null"),
+        ("models", "9648_add_empty_key_value_pairs_to_tiles"),
     ]
 
     update_check_excess_tiles_trigger = """
diff --git a/arches/app/models/migrations/9746_related_resource_post_save_bug.py b/arches/app/models/migrations/9746_related_resource_post_save_bug.py
index af543716725..25944620d9f 100644
--- a/arches/app/models/migrations/9746_related_resource_post_save_bug.py
+++ b/arches/app/models/migrations/9746_related_resource_post_save_bug.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('models', '9648_add_empty_key_value_pairs_to_tiles'),
+        ('models', '9670_improve_bulk_load_performance'),
     ]
 
     forward_sql = """

From 304f1622fa5ee53c4d5c84a325a1b7517673b78a Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Thu, 20 Jul 2023 17:08:38 -0700
Subject: [PATCH 36/44] Fix logic to use search url in bulk editor, #9806

---
 arches/app/etl_modules/base_data_editor.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/arches/app/etl_modules/base_data_editor.py b/arches/app/etl_modules/base_data_editor.py
index 7aa8b118575..739b9de1c1e 100644
--- a/arches/app/etl_modules/base_data_editor.py
+++ b/arches/app/etl_modules/base_data_editor.py
@@ -1,18 +1,17 @@
 from datetime import datetime
 import json
 import logging
-import requests
-from urllib.parse import urlparse, urlunparse
+from urllib.parse import urlsplit, parse_qs
 import uuid
 from django.db import connection
-from django.db.models.functions import Lower
+from django.http import HttpRequest
 from django.utils.translation import ugettext as _
 from arches.app.datatypes.datatypes import DataTypeFactory
 from arches.app.etl_modules.base_import_module import BaseImportModule
 from arches.app.models.models import GraphModel, Node
 from arches.app.models.system_settings import settings
 import arches.app.tasks as tasks
-from arches.app.utils.index_database import index_resources_by_transaction
+from arches.app.views.search import search_results
 
 logger = logging.getLogger(__name__)
 
@@ -101,11 +100,16 @@ def log_event(self, cursor, status):
         )
 
     def get_resourceids_from_search_url(self, search_url):
-        parsed_url = urlparse(search_url)
-        search_result_url = urlunparse(parsed_url._replace(path="/search/resources"))
-        response = requests.get(search_result_url + "&export=true")
-        search_results = response.json()["results"]["hits"]["hits"]
-        return [result["_source"]["resourceinstanceid"] for result in search_results]
+        request = HttpRequest()
+        request.user = self.request.user
+        request.method = "GET"
+        request.GET["export"] = True
+        params = parse_qs(urlsplit(search_url).query)
+        for k, v in params.items():
+            request.GET.__setitem__(k, v[0])
+        response = search_results(request)
+        results = json.loads(response.content)['results']['hits']['hits']
+        return [result["_source"]["resourceinstanceid"] for result in results]
 
     def validate(self, request):
         return {"success": True, "data": {}}

From 2f66aacceca4b02c44398d5ac77e6a856fdf2891 Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Fri, 21 Jul 2023 11:08:15 -0700
Subject: [PATCH 37/44] fixes broken card tree #9805

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7f14cbba835..240d1f030c7 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
         "jquery-validation": "1.19.5",
         "jqueryui": "1.11.1",
         "js-cookie": "2.1.1",
-        "knockout": "~3.5.1",
+        "knockout": "3.5.0",
         "knockout-mapping": "~2.6.0",
         "knockstrap": "1.3.2",
         "latlon-geohash": "1.1.0",

From 80e237912b84a7703d2fdc3d8738d57f3af690ad Mon Sep 17 00:00:00 2001
From: Christopher Byrd <cbyrd@fargeo.com>
Date: Thu, 20 Jul 2023 15:46:12 -0700
Subject: [PATCH 38/44] fixes missing nodegroup issue #9803

---
 .../app/templates/views/graph/graph-designer/node-form.htm   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arches/app/templates/views/graph/graph-designer/node-form.htm b/arches/app/templates/views/graph/graph-designer/node-form.htm
index 116044ed080..f7a4f3097f3 100644
--- a/arches/app/templates/views/graph/graph-designer/node-form.htm
+++ b/arches/app/templates/views/graph/graph-designer/node-form.htm
@@ -267,7 +267,10 @@ <h4 class="function-node-alert" data-bind="text: isFuncNode()"></h4>
                                         class="switch switch-small arches-switch" 
                                         data-bind="
                                             css: {
-                                                'on': $data.node() && $data.node().nodeid === $data.node().nodeGroupId() && $data.nodegroup().cardinality() === 'n', 
+                                                'on': (
+                                                    $data.node() && $data.node().nodeid === $data.node().nodeGroupId() 
+                                                    && $data.nodegroup() && $data.nodegroup().cardinality() === 'n'
+                                                ), 
                                                 'disabled': !$data.nodegroup() || $data.node() && $data.node().nodeid !== $data.node().nodeGroupId()
                                             }, 
                                             click: $data.updateCardinality

From 8b150f95190148f7631f8b978722b9a24d299e68 Mon Sep 17 00:00:00 2001
From: atapscott <alan.tapscott@gmail.com>
Date: Fri, 30 Jun 2023 15:14:33 +0200
Subject: [PATCH 39/44] Check individual concept labels when importing with
 --create_concepts create

---
 .../app/utils/data_management/resources/formats/csvfile.py   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arches/app/utils/data_management/resources/formats/csvfile.py b/arches/app/utils/data_management/resources/formats/csvfile.py
index c744b40a889..3e2e773943f 100644
--- a/arches/app/utils/data_management/resources/formats/csvfile.py
+++ b/arches/app/utils/data_management/resources/formats/csvfile.py
@@ -622,9 +622,10 @@ def process_resourceid(resourceid, overwrite):
                                     for concept_value in concept:
                                         concepts_to_create[node["arches_nodeid"]][str(uuid.uuid4())] = concept_value
                                 # if collection in concepts to create then add child concept to collection
-                                elif row[node["file_field_name"]] not in list(concepts_to_create[node["arches_nodeid"]].values()):
+                                else:
                                     for concept_value in concept:
-                                        concepts_to_create[node["arches_nodeid"]][str(uuid.uuid4())] = concept_value
+                                        if concept_value not in list(concepts_to_create[node["arches_nodeid"]].values()):
+                                            concepts_to_create[node["arches_nodeid"]][str(uuid.uuid4())] = concept_value
 
                 if len(non_contiguous_resource_ids) > 0:
                     print("*" * 80)

From e50e7c33539fdd6baf635e7bc76d34f2fdce9cd8 Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Mon, 24 Jul 2023 14:21:16 -0700
Subject: [PATCH 40/44] Update to return value as an object form, #9523

---
 arches/app/datatypes/url.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arches/app/datatypes/url.py b/arches/app/datatypes/url.py
index c2f2d36dc7e..cb879205a46 100644
--- a/arches/app/datatypes/url.py
+++ b/arches/app/datatypes/url.py
@@ -101,7 +101,10 @@ def transform_value_for_tile(self, value, **kwargs):
                 return ast.literal_eval(value)
             except:
                 # this will probably fail validation, but that is ok. We need the error to report the value.
-                return value
+                if isinstance(value, dict):
+                    return value
+                else:
+                    return {"url": value, "url_label": ""}
         except BaseException:
             if isinstance(value, dict):
                 return value

From b42d90bdc856d456232eb66b30b957fab971323e Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Mon, 24 Jul 2023 15:45:11 -0700
Subject: [PATCH 41/44] Move comments, #9824

---
 arches/app/datatypes/url.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arches/app/datatypes/url.py b/arches/app/datatypes/url.py
index cb879205a46..cf496dd8718 100644
--- a/arches/app/datatypes/url.py
+++ b/arches/app/datatypes/url.py
@@ -100,12 +100,12 @@ def transform_value_for_tile(self, value, **kwargs):
             try:
                 return ast.literal_eval(value)
             except:
-                # this will probably fail validation, but that is ok. We need the error to report the value.
                 if isinstance(value, dict):
                     return value
                 else:
                     return {"url": value, "url_label": ""}
         except BaseException:
+            # this will probably fail validation, but that is ok. We need the error to report the value.
             if isinstance(value, dict):
                 return value
             else:

From ec270e44aa3531127ffb8a792cb5b9c58e696f59 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jwalls@fargeo.com>
Date: Mon, 24 Jul 2023 19:57:45 -0400
Subject: [PATCH 42/44] Add upper bound on urllib3 (<2) #9826

`requests` lifted its upper bound from <1.26 to <3
in 2.30.0, but this conflicts with `elastic-transport`'s
upper bound of <2.
---
 arches/install/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arches/install/requirements.txt b/arches/install/requirements.txt
index ad7ffc5e9ef..c6fc44b64a9 100644
--- a/arches/install/requirements.txt
+++ b/arches/install/requirements.txt
@@ -1,5 +1,6 @@
 Django==3.2.20
 psycopg2==2.9.6
+urllib3<2
 elasticsearch>=8.3.1,<9.0.0
 rdflib==4.2.2
 django-guardian==2.3.0

From 245f484f682859412b21d03d0294c87cdad0c0e5 Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Tue, 25 Jul 2023 14:43:12 -0700
Subject: [PATCH 43/44] Merge 6.2.x into 7.4.x

---
 releases/6.2.4.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 releases/6.2.4.md

diff --git a/releases/6.2.4.md b/releases/6.2.4.md
new file mode 100644
index 00000000000..e8b39a8f129
--- /dev/null
+++ b/releases/6.2.4.md
@@ -0,0 +1,61 @@
+Arches 6.2.4 release notes
+------------------------
+### Bug Fixes and Enhancements
+
+- Updated Django to latest patch release #9731
+- Updated several JS dependencies to latest patch releases, #9782, #9814, #9527
+- Ensure tiles are properly filtered by user in resource JSON, #9780
+- Fix display of IIIF widget in reports, #8419
+
+
+### Dependency changes:
+```
+Javascript:
+    Upgraded:
+        @mapbox/geojson-extent: 0.3.2 > ~1.0.1
+        jquery: 3.6.1 > ^3.6.1
+        jquery-migrate: 3.4.0 > ~3.4.1,
+        moment-timezone: 0.5.34 > ~0.5.43
+        requirejs-text: 2.0.12 > ~2.0.16
+        underscore: 1.13.4 > ~1.13.6
+        eonasdan-bootstrap-datetimepicker: 4.17.44 > ~4.17.49
+
+Python:
+    Upgraded:
+        Django 3.2.18 > 3.2.20
+```
+
+
+### Upgrading Arches
+1. You must be upgraded to at least version 6.2.0 before proceeding.
+
+2. Upgrade to Arches 6.2.4
+
+    If using a virtual environment, be sure to activate it:
+
+        pip install --upgrade arches==6.2.4
+
+3. Update your Javascript dependencies
+
+    Navigate to the directory with your project's package.json file. This is located in the same directory as your project's settings.py file.
+    Ensure your arches dependency points to either `#archesproject/arches#dev/6.2.x` or `#archesproject/arches#stable/6.2.4`.\
+    For example:
+
+        "dependencies": {
+            "arches": "archesproject/arches#dev/6.2.x"
+        }
+    
+    Then run:
+        yarn install
+
+4. If you are running Arches on Apache, be sure to run:
+
+    ```
+    python manage.py collectstatic
+    ```
+    and restart your server.
+    ```
+    sudo service apache2 reload
+    ```
+
+5. Finally, If you are running Celery, you should also restart your Celery worker(s). The process for doing this depends on how Celery is being run.

From 015fc01925e466de0348030074515acca0f2ab98 Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Wed, 26 Jul 2023 16:36:34 -0700
Subject: [PATCH 44/44] Simplify counting to avoid unecessary join, #9387

---
 arches/app/etl_modules/base_data_editor.py | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/arches/app/etl_modules/base_data_editor.py b/arches/app/etl_modules/base_data_editor.py
index 739b9de1c1e..01b83877f4d 100644
--- a/arches/app/etl_modules/base_data_editor.py
+++ b/arches/app/etl_modules/base_data_editor.py
@@ -172,26 +172,15 @@ def get_preview_data(self, graph_id, node_id, resourceids, language_code, old_te
             + text_query
         )
 
-        tile_sub_query = (
+        resource_count_query = (
             """
-            AND resourceinstanceid IN (SELECT DISTINCT t.resourceinstanceid FROM tiles t, nodes n
+            SELECT count(DISTINCT t.resourceinstanceid) FROM tiles t, nodes n
             WHERE t.nodegroupid = n.nodegroupid
         """
             + node_id_query
             + graph_id_query
             + resourceids_query
             + text_query
-            + ")"
-        )
-
-        resource_count_query = (
-            """
-            SELECT count(n.resourceinstanceid) FROM resource_instances n
-            WHERE 0 = 0
-        """
-            + graph_id_query
-            + resourceids_query
-            + tile_sub_query
         )
 
         with connection.cursor() as cursor: