diff --git a/bcp.code-workspace b/bcp.code-workspace
index 022ef15..5e58c62 100644
--- a/bcp.code-workspace
+++ b/bcp.code-workspace
@@ -10,8 +10,8 @@
 			{   "type": "python",
 				"request": "launch",
 				"name": "Launch Program",
-				"program": "/Users/user/Documents/GitHub/Big-Cannon-Project/main.py",
-				"env": {"GOOGLE_APPLICATION_CREDENTIALS":"/Users/user/Documents/GitHub/Big-Cannon-Project/ultima-ratio-221014-e18b185a3810.json"}
+				"program": "/Users/paulharwood/Documents/GitHub/ultima-ratio/main.py",
+				"env": {"GOOGLE_APPLICATION_CREDENTIALS":"/Users/paulharwood/Documents/GitHub/ultima-ratio/ultima-ratio-221014-e18b185a3810.json"}
 			}
 		]
 	}
diff --git a/bcp/angular.json b/bcp/angular.json
index e641b5c..aabed32 100644
--- a/bcp/angular.json
+++ b/bcp/angular.json
@@ -20,7 +20,9 @@
             "preserveSymlinks": true,
             "index": "src/index.html",
             "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "zone.js"
+            ],
             "tsConfig": "tsconfig.app.json",
             "aot": true,
             "assets": [
diff --git a/bcp/package-lock.json b/bcp/package-lock.json
index 1607eba..69c0c98 100644
--- a/bcp/package-lock.json
+++ b/bcp/package-lock.json
@@ -9,25 +9,25 @@
       "version": "3.0.0a6",
       "license": "MIT",
       "dependencies": {
-        "@angular-devkit/build-angular": "17.1.3",
-        "@angular/animations": "17.1.3",
-        "@angular/cdk": "17.1.2",
-        "@angular/common": "17.1.3",
-        "@angular/compiler": "17.1.3",
-        "@angular/core": "17.1.3",
-        "@angular/fire": "*",
+        "@angular-devkit/build-angular": "17",
+        "@angular/animations": "17",
+        "@angular/cdk": "17",
+        "@angular/common": "17",
+        "@angular/compiler": "17",
+        "@angular/core": "17",
+        "@angular/fire": "17",
         "@angular/flex-layout": "15.0.0-beta.42",
-        "@angular/forms": "17.1.3",
-        "@angular/google-maps": "16",
-        "@angular/material": "17.1.2",
-        "@angular/platform-browser": "17.1.3",
-        "@angular/platform-browser-dynamic": "17.1.3",
-        "@angular/router": "17.1.3",
+        "@angular/forms": "17",
+        "@angular/google-maps": "17.1.2",
+        "@angular/material": "17",
+        "@angular/platform-browser": "17",
+        "@angular/platform-browser-dynamic": "17",
+        "@angular/router": "17",
         "@googlemaps/markerclusterer": "*",
         "@types/firebase": "*",
+        "@types/supercluster": "^7.1.3",
         "firebase": "*",
         "ng-gallery": "8",
-        "ngx-auth-firebaseui": "^7.1.0",
         "ngx-lightbox": "*",
         "patch-package": "^7.0.0",
         "rxjs": "^7.8.1",
@@ -41,10 +41,10 @@
         "workbox-window": "*"
       },
       "devDependencies": {
-        "@angular/cli": "17.1.3",
-        "@angular/compiler-cli": "17.1.3",
-        "@angular/language-service": "17.1.3",
-        "@angular/localize": "17.1.3",
+        "@angular/cli": "17",
+        "@angular/compiler-cli": "17",
+        "@angular/language-service": "17",
+        "@angular/localize": "17",
         "@types/node": "*",
         "fuzzy": "*",
         "inquirer": "*",
@@ -85,43 +85,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": {
-      "version": "17.1.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.1.3.tgz",
-      "integrity": "sha512-iuVK4hyW3YhusxIi8zGBvvVA9pWtDT3H6LQbWdVk9D3jXCZBIrEMklvAiJErqficKnUurf6gtFOeA8Fop6GotA==",
-      "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.0",
-        "picomatch": "3.0.1",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/architect/node_modules/picomatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/@angular-devkit/build-angular": {
       "version": "17.1.3",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.1.3.tgz",
@@ -251,32 +214,6 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": {
-      "version": "17.1.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.1.3.tgz",
-      "integrity": "sha512-iuVK4hyW3YhusxIi8zGBvvVA9pWtDT3H6LQbWdVk9D3jXCZBIrEMklvAiJErqficKnUurf6gtFOeA8Fop6GotA==",
-      "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.0",
-        "picomatch": "3.0.1",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/@babel/core": {
       "version": "7.23.7",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz",
@@ -353,17 +290,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/picomatch": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
@@ -430,18 +356,19 @@
       }
     },
     "node_modules/@angular-devkit/core": {
-      "version": "15.2.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.8.tgz",
-      "integrity": "sha512-Lo4XrbDMtXarKnMrFgWLmQdSX+3QPNAg4otG8cmp/U4jJyjV4dAYKEAsb1sCNGUSM4h4v09EQU/5ugVjDU29lQ==",
+      "version": "17.1.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.1.3.tgz",
+      "integrity": "sha512-iuVK4hyW3YhusxIi8zGBvvVA9pWtDT3H6LQbWdVk9D3jXCZBIrEMklvAiJErqficKnUurf6gtFOeA8Fop6GotA==",
       "dependencies": {
         "ajv": "8.12.0",
         "ajv-formats": "2.1.1",
         "jsonc-parser": "3.2.0",
-        "rxjs": "6.6.7",
+        "picomatch": "3.0.1",
+        "rxjs": "7.8.1",
         "source-map": "0.7.4"
       },
       "engines": {
-        "node": "^14.20.0 || ^16.13.0 || >=18.10.0",
+        "node": "^18.13.0 || >=20.9.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       },
@@ -454,74 +381,34 @@
         }
       }
     },
-    "node_modules/@angular-devkit/core/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
+    "node_modules/@angular-devkit/core/node_modules/picomatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
+      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
       "engines": {
-        "npm": ">=2.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/@angular-devkit/core/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
     "node_modules/@angular-devkit/schematics": {
-      "version": "15.2.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.8.tgz",
-      "integrity": "sha512-w6EUGC96kVsH9f8sEzajzbONMawezyVBiSo+JYp5r25rQArAz/a+KZntbuETWHQ0rQOEsKmUNKxwmr11BaptSQ==",
+      "version": "17.1.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.1.3.tgz",
+      "integrity": "sha512-zKoWG1hDfvi1vR9Hqoca9hWo9vDg8evmQvGcBW5jXR5ndZi5Oit/uDcGdA8WUKvBd1EG7WMqp0FgcDR9EA9WCw==",
       "dependencies": {
-        "@angular-devkit/core": "15.2.8",
+        "@angular-devkit/core": "17.1.3",
         "jsonc-parser": "3.2.0",
-        "magic-string": "0.29.0",
+        "magic-string": "0.30.5",
         "ora": "5.4.1",
-        "rxjs": "6.6.7"
+        "rxjs": "7.8.1"
       },
       "engines": {
-        "node": "^14.20.0 || ^16.13.0 || >=18.10.0",
+        "node": "^18.13.0 || >=20.9.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@angular-material-extensions/password-strength": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/@angular-material-extensions/password-strength/-/password-strength-11.0.1.tgz",
-      "integrity": "sha512-ZKZ7jvMkWH4NiuU0skvhVK02n1CgPW4PvTRHgX0tnz6380bDwmChu8t1hf+rAeExPcehC2rBq0mU6j0+tDfrmw==",
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "@angular/cdk": "^14.x",
-        "@angular/common": "^14.x",
-        "@angular/core": "^14.x",
-        "@angular/forms": "^14.x",
-        "@angular/material": "^14.x"
-      }
-    },
     "node_modules/@angular/animations": {
       "version": "17.1.3",
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.1.3.tgz",
@@ -586,67 +473,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/core": {
-      "version": "17.1.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.1.3.tgz",
-      "integrity": "sha512-iuVK4hyW3YhusxIi8zGBvvVA9pWtDT3H6LQbWdVk9D3jXCZBIrEMklvAiJErqficKnUurf6gtFOeA8Fop6GotA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.0",
-        "picomatch": "3.0.1",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/schematics": {
-      "version": "17.1.3",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.1.3.tgz",
-      "integrity": "sha512-zKoWG1hDfvi1vR9Hqoca9hWo9vDg8evmQvGcBW5jXR5ndZi5Oit/uDcGdA8WUKvBd1EG7WMqp0FgcDR9EA9WCw==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "17.1.3",
-        "jsonc-parser": "3.2.0",
-        "magic-string": "0.30.5",
-        "ora": "5.4.1",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/@schematics/angular": {
-      "version": "17.1.3",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.1.3.tgz",
-      "integrity": "sha512-hmeasOvzmniy6urtzUKhEqGO67iPuLX/dVtkF4nWp2NTtcEKlvcJobNDMc+CTlX4+ZMPVOvmhDMQqrlfekZ+NQ==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "17.1.3",
-        "@angular-devkit/schematics": "17.1.3",
-        "jsonc-parser": "3.2.0"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
     "node_modules/@angular/cli/node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -659,30 +485,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@angular/cli/node_modules/magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/picomatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/@angular/cli/node_modules/semver": {
       "version": "7.5.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
@@ -781,14 +583,13 @@
       }
     },
     "node_modules/@angular/fire": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@angular/fire/-/fire-7.5.0.tgz",
-      "integrity": "sha512-M/JJ5SKnpfNZFLKl0Awjn3r2NhURy2Mx+E8EzSDWSg1sHD7IThrynZYPUSZR+cd3KGsGoEacIP2x8Ra+0a+CVg==",
-      "dependencies": {
-        "@angular-devkit/schematics": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
-        "@schematics/angular": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
-        "file-loader": "^6.2.0",
-        "firebase": "^9.8.0",
+      "version": "17.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/fire/-/fire-17.0.1.tgz",
+      "integrity": "sha512-bhbogL4m50AKzSVn4kdZX3/2XrYTMvpsgP/4xnTPuMoTFgOrjV24CDc+1lOL+Z0QXRIupj84/Pg4KNFD4lXXzQ==",
+      "dependencies": {
+        "@angular-devkit/schematics": "^17.0.0",
+        "@schematics/angular": "^17.0.0",
+        "firebase": "^10.7.0",
         "fs-extra": "^8.0.1",
         "fuzzy": "^0.1.3",
         "inquirer": "^8.1.1",
@@ -797,19 +598,19 @@
         "node-fetch": "^2.6.1",
         "open": "^8.0.0",
         "ora": "^5.3.0",
-        "rxfire": "^6.0.0",
+        "rxfire": "^6.0.5",
         "semver": "^7.1.3",
         "triple-beam": "^1.3.0",
-        "tslib": "^2.0.0",
+        "tslib": "^2.3.0",
         "winston": "^3.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
-        "@angular/core": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
-        "@angular/platform-browser": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
-        "@angular/platform-browser-dynamic": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
-        "firebase-tools": "^9.9.0 || ^10.0.0 || ^11.0.0",
-        "rxjs": "~6.6.0 || ^7.0.0"
+        "@angular/common": "^17.0.0",
+        "@angular/core": "^17.0.0",
+        "@angular/platform-browser": "^17.0.0",
+        "@angular/platform-browser-dynamic": "^17.0.0",
+        "firebase-tools": "^13.0.0",
+        "rxjs": "~7.8.0"
       },
       "peerDependenciesMeta": {
         "firebase-tools": {
@@ -1025,16 +826,16 @@
       }
     },
     "node_modules/@angular/google-maps": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/google-maps/-/google-maps-16.0.1.tgz",
-      "integrity": "sha512-+0XS6CExQgKO+NT3SsGw+moecOud0KylYmQfAVK+klG5Fizni+PQK+AaaCvD8srnv/QbXApiSjuLXO8iK4YAyg==",
+      "version": "17.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/google-maps/-/google-maps-17.1.2.tgz",
+      "integrity": "sha512-XPURw4m36fU3KQHzZSM5Ubz83GB3zgt5J8WrDTsGM1hwtVk+onQEkMjYfSRl8cbIChOYigvnkm4bckxu6Y/8hA==",
       "dependencies": {
         "@types/google.maps": "^3.52.4",
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "^16.0.0 || ^17.0.0",
-        "@angular/core": "^16.0.0 || ^17.0.0",
+        "@angular/common": "^17.0.0 || ^18.0.0",
+        "@angular/core": "^17.0.0 || ^18.0.0",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
@@ -3233,14 +3034,14 @@
       }
     },
     "node_modules/@firebase/analytics": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.0.tgz",
-      "integrity": "sha512-Locv8gAqx0e+GX/0SI3dzmBY5e9kjVDtD+3zCFLJ0tH2hJwuCAiL+5WkHuxKj92rqQj/rvkBUCfA1ewlX2hehg==",
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.1.tgz",
+      "integrity": "sha512-5mnH1aQa99J5lZMJwTNzIoRc4yGXHf+fOn+EoEWhCDA3XGPweGHcylCbqq+G1wVJmfILL57fohDMa8ftMZ+44g==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/installations": "0.6.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/installations": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3248,14 +3049,14 @@
       }
     },
     "node_modules/@firebase/analytics-compat": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.6.tgz",
-      "integrity": "sha512-4MqpVLFkGK7NJf/5wPEEP7ePBJatwYpyjgJ+wQHQGHfzaCDgntOnl9rL2vbVGGKCnRqWtZDIWhctB86UWXaX2Q==",
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.7.tgz",
+      "integrity": "sha512-17VCly4P0VFBDqaaal7m1nhyYQwsygtaTpSsnc51sFPRrr9XIYtnD8ficon9fneEGEoJQ2g7OtASvhwX9EbK8g==",
       "dependencies": {
-        "@firebase/analytics": "0.10.0",
+        "@firebase/analytics": "0.10.1",
         "@firebase/analytics-types": "0.8.0",
-        "@firebase/component": "0.6.4",
-        "@firebase/util": "1.9.3",
+        "@firebase/component": "0.6.5",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3268,25 +3069,25 @@
       "integrity": "sha512-iRP+QKI2+oz3UAh4nPEq14CsEjrjD6a5+fuypjScisAh9kXKFvdJOZJDwk7kikLvWVLGEs9+kIUS4LPQV7VZVw=="
     },
     "node_modules/@firebase/app": {
-      "version": "0.9.10",
-      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.9.10.tgz",
-      "integrity": "sha512-2aLHuPLrjgxds95e2JpuAb29pBGArihHwjdJBUKtJnSxxEdwxAsGuXzSrOrmzYXlAwxUTZkOD6Cbl/dfTTwhKA==",
+      "version": "0.9.27",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.9.27.tgz",
+      "integrity": "sha512-p2Dvl1ge4kRsyK5+wWcmdAIE9MSwZ0pDKAYB51LZgZuz6wciUZk4E1yAEdkfQlRxuHehn+Ol9WP5Qk2XQZiHGg==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "idb": "7.1.1",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@firebase/app-check": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.7.0.tgz",
-      "integrity": "sha512-y0raLJpEtiL+wonfInFMaSfBV/EDvr356ZHMWbpr5F7fR0/I3cC0h7U6SKpKhrbSHJ0fOYIe0xbih20KTlpcnA==",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.8.2.tgz",
+      "integrity": "sha512-A2B5+ldOguYAeqW1quFN5qNdruSNRrg4W59ag1Eq6QzxuHNIkrE+TrapfrW/z5NYFjCxAYqr/unVCgmk80Dwcg==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3294,15 +3095,15 @@
       }
     },
     "node_modules/@firebase/app-check-compat": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.6.tgz",
-      "integrity": "sha512-azHAeHi9igoaIo04E6Yfuc7aIbWoWuBXuqjyYyWbeCc8Zz/NfJvIAgmXugN4LdxsHJ7XGlZTvwJ6YaYROdSa7A==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.9.tgz",
+      "integrity": "sha512-7LxyupQ8XeEHRh72mO+tqm69kHT6KbWi2KtFMGedJ6tNbwzFzojcXESMKN8RpADXbYoQgY3loWMJjMx4r2Zt7w==",
       "dependencies": {
-        "@firebase/app-check": "0.7.0",
+        "@firebase/app-check": "0.8.2",
         "@firebase/app-check-types": "0.5.0",
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3310,9 +3111,9 @@
       }
     },
     "node_modules/@firebase/app-check-interop-types": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.2.0.tgz",
-      "integrity": "sha512-+3PQIeX6/eiVK+x/yg8r6xTNR97fN7MahFDm+jiQmDjcyvSefoGuTTNQuuMScGyx3vYUBeZn+Cp9kC0yY/9uxQ=="
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.0.tgz",
+      "integrity": "sha512-xAxHPZPIgFXnI+vb4sbBjZcde7ZluzPPaSK7Lx3/nmuVk4TjZvnL8ONnkd4ERQKL8WePQySU+pRcWkh8rDf5Sg=="
     },
     "node_modules/@firebase/app-check-types": {
       "version": "0.5.0",
@@ -3320,14 +3121,14 @@
       "integrity": "sha512-uwSUj32Mlubybw7tedRzR24RP8M8JUVR3NPiMk3/Z4bCmgEKTlQBwMXrehDAZ2wF+TsBq0SN1c6ema71U/JPyQ=="
     },
     "node_modules/@firebase/app-compat": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.10.tgz",
-      "integrity": "sha512-kulrAW9JKkWeLeXKYjipCh60MmZcRC626NYpNWKxnjZ3YsVk6vgMuM+BHvhHQVp0fgfOq3hMNp5tyhlAB1Q1EQ==",
+      "version": "0.2.27",
+      "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.27.tgz",
+      "integrity": "sha512-SYlqocfUDKPHR6MSFC8hree0BTiWFu5o8wbf6zFlYXyG41w7TcHp4wJi4H/EL5V6cM4kxwruXTJtqXX/fRAZtw==",
       "dependencies": {
-        "@firebase/app": "0.9.10",
-        "@firebase/component": "0.6.4",
+        "@firebase/app": "0.9.27",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
@@ -3337,53 +3138,51 @@
       "integrity": "sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q=="
     },
     "node_modules/@firebase/auth": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.23.2.tgz",
-      "integrity": "sha512-dM9iJ0R6tI1JczuGSxXmQbXAgtYie0K4WvKcuyuSTCu9V8eEDiz4tfa1sO3txsfvwg7nOY3AjoCyMYEdqZ8hdg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.6.0.tgz",
+      "integrity": "sha512-Qhl35eJTV6BwvuueTPCY6x8kUlYyzALtjp/Ws0X3fw3AnjVVfuVb7oQ3Xh5VPVfMFhaIuUAd1KXwcAuIklkSDw==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
-        "node-fetch": "2.6.7",
-        "tslib": "^2.1.0"
+        "@firebase/util": "1.9.4",
+        "tslib": "^2.1.0",
+        "undici": "5.26.5"
       },
       "peerDependencies": {
-        "@firebase/app": "0.x"
+        "@firebase/app": "0.x",
+        "@react-native-async-storage/async-storage": "^1.18.1"
+      },
+      "peerDependenciesMeta": {
+        "@react-native-async-storage/async-storage": {
+          "optional": true
+        }
       }
     },
     "node_modules/@firebase/auth-compat": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.4.2.tgz",
-      "integrity": "sha512-Q30e77DWXFmXEt5dg5JbqEDpjw9y3/PcP9LslDPR7fARmAOTIY9MM6HXzm9KC+dlrKH/+p6l8g9ifJiam9mc4A==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.5.2.tgz",
+      "integrity": "sha512-pRgje5BPCNR1vXyvGOVXwOHtv88A2WooXfklI8sV7/jWi03ExFqNfpJT26GUo/oD39NoKJ3Kt6rD5gVvdV7lMw==",
       "dependencies": {
-        "@firebase/auth": "0.23.2",
+        "@firebase/auth": "1.6.0",
         "@firebase/auth-types": "0.12.0",
-        "@firebase/component": "0.6.4",
-        "@firebase/util": "1.9.3",
-        "node-fetch": "2.6.7",
-        "tslib": "^2.1.0"
+        "@firebase/component": "0.6.5",
+        "@firebase/util": "1.9.4",
+        "tslib": "^2.1.0",
+        "undici": "5.26.5"
       },
       "peerDependencies": {
         "@firebase/app-compat": "0.x"
       }
     },
-    "node_modules/@firebase/auth-compat/node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+    "node_modules/@firebase/auth-compat/node_modules/undici": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz",
+      "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "@fastify/busboy": "^2.0.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">=14.0"
       }
     },
     "node_modules/@firebase/auth-interop-types": {
@@ -3400,82 +3199,75 @@
         "@firebase/util": "1.x"
       }
     },
-    "node_modules/@firebase/auth/node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+    "node_modules/@firebase/auth/node_modules/undici": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz",
+      "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "@fastify/busboy": "^2.0.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">=14.0"
       }
     },
     "node_modules/@firebase/component": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.4.tgz",
-      "integrity": "sha512-rLMyrXuO9jcAUCaQXCMjCMUsWrba5fzHlNK24xz5j2W6A/SRmK8mZJ/hn7V0fViLbxC0lPMtrK1eYzk6Fg03jA==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.5.tgz",
+      "integrity": "sha512-2tVDk1ixi12sbDmmfITK8lxSjmcb73BMF6Qwc3U44hN/J1Fi1QY/Hnnb6klFlbB9/G16a3J3d4nXykye2EADTw==",
       "dependencies": {
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@firebase/database": {
-      "version": "0.14.4",
-      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.14.4.tgz",
-      "integrity": "sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.3.tgz",
+      "integrity": "sha512-9fjqLt9JzL46gw9+NRqsgQEMjgRwfd8XtzcKqG+UYyhVeFCdVRQ0Wp6Dw/dvYHnbH5vNEKzNv36dcB4p+PIAAA==",
       "dependencies": {
+        "@firebase/app-check-interop-types": "0.3.0",
         "@firebase/auth-interop-types": "0.2.1",
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "faye-websocket": "0.11.4",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@firebase/database-compat": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.3.4.tgz",
-      "integrity": "sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-1.0.3.tgz",
+      "integrity": "sha512-7tHEOcMbK5jJzHWyphPux4osogH/adWwncxdMxdBpB9g1DNIyY4dcz1oJdlkXGM/i/AjUBesZsd5CuwTRTBNTw==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/database": "0.14.4",
-        "@firebase/database-types": "0.10.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/database": "1.0.3",
+        "@firebase/database-types": "1.0.1",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@firebase/database-types": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.10.4.tgz",
-      "integrity": "sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.1.tgz",
+      "integrity": "sha512-Tmcmx5XgiI7UVF/4oGg2P3AOTfq3WKEPsm2yf+uXtN7uG/a4WTWhVMrXGYRY2ZUL1xPxv9V33wQRJ+CcrUhVXw==",
       "dependencies": {
         "@firebase/app-types": "0.9.0",
-        "@firebase/util": "1.9.3"
+        "@firebase/util": "1.9.4"
       }
     },
     "node_modules/@firebase/firestore": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.12.0.tgz",
-      "integrity": "sha512-mZdwIJBOIAdkaykqZqMYQZldSH19gf7u1Y77UVxh4igm1zaG8ZiGE8qYVXQ/vGc+BvvUZ8OpnqLI5Z0JSJtDIg==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.4.2.tgz",
+      "integrity": "sha512-YaX6ypa/RzU6OkxzUQlpSxwhOIWdTraCNz7sMsbaSEjjl/pj/QvX6TqjkdWGzuBYh2S6rz7ErhDO0g39oZZw/g==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
-        "@firebase/webchannel-wrapper": "0.10.0",
-        "@grpc/grpc-js": "~1.7.0",
-        "@grpc/proto-loader": "^0.6.13",
-        "node-fetch": "2.6.7",
-        "tslib": "^2.1.0"
+        "@firebase/util": "1.9.4",
+        "@firebase/webchannel-wrapper": "0.10.5",
+        "@grpc/grpc-js": "~1.9.0",
+        "@grpc/proto-loader": "^0.7.8",
+        "tslib": "^2.1.0",
+        "undici": "5.26.5"
       },
       "engines": {
         "node": ">=10.10.0"
@@ -3485,14 +3277,14 @@
       }
     },
     "node_modules/@firebase/firestore-compat": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.3.9.tgz",
-      "integrity": "sha512-u4fGeuaDaMnAPp20PAm6vrhktVGCtfmC3iup5ymMkOUNIqbuQ/+WLL3zUlJi+Ytl4hX0vVNg4UQEh4vfMorc4Q==",
-      "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/firestore": "3.12.0",
-        "@firebase/firestore-types": "2.5.1",
-        "@firebase/util": "1.9.3",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.3.25.tgz",
+      "integrity": "sha512-+xI7WmsgZCBhMn/+uhDKcg+lsOUJ9FJyt5PGTzkFPbCsozWfeQZ7eVnfPh0rMkUOf0yIQ924RIe04gwvEIbcoQ==",
+      "dependencies": {
+        "@firebase/component": "0.6.5",
+        "@firebase/firestore": "4.4.2",
+        "@firebase/firestore-types": "3.0.0",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3500,59 +3292,51 @@
       }
     },
     "node_modules/@firebase/firestore-types": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-2.5.1.tgz",
-      "integrity": "sha512-xG0CA6EMfYo8YeUxC8FeDzf6W3FX1cLlcAGBYV6Cku12sZRI81oWcu61RSKM66K6kUENP+78Qm8mvroBcm1whw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-3.0.0.tgz",
+      "integrity": "sha512-Meg4cIezHo9zLamw0ymFYBD4SMjLb+ZXIbuN7T7ddXN6MGoICmOTq3/ltdCGoDCS2u+H1XJs2u/cYp75jsX9Qw==",
       "peerDependencies": {
         "@firebase/app-types": "0.x",
         "@firebase/util": "1.x"
       }
     },
-    "node_modules/@firebase/firestore/node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+    "node_modules/@firebase/firestore/node_modules/undici": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz",
+      "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "@fastify/busboy": "^2.0.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">=14.0"
       }
     },
     "node_modules/@firebase/functions": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.9.4.tgz",
-      "integrity": "sha512-3H2qh6U+q+nepO5Hds+Ddl6J0pS+zisuBLqqQMRBHv9XpWfu0PnDHklNmE8rZ+ccTEXvBj6zjkPfdxt6NisvlQ==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.11.1.tgz",
+      "integrity": "sha512-3uUa1hB79Gmy6E1gHTfzoHeZolBeHc/I/n3+lOCDe6BOos9AHmzRjKygcFE/7VA2FJjitCE0K+OHI6+OuoY8fQ==",
       "dependencies": {
-        "@firebase/app-check-interop-types": "0.2.0",
+        "@firebase/app-check-interop-types": "0.3.0",
         "@firebase/auth-interop-types": "0.2.1",
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/messaging-interop-types": "0.2.0",
-        "@firebase/util": "1.9.3",
-        "node-fetch": "2.6.7",
-        "tslib": "^2.1.0"
+        "@firebase/util": "1.9.4",
+        "tslib": "^2.1.0",
+        "undici": "5.26.5"
       },
       "peerDependencies": {
         "@firebase/app": "0.x"
       }
     },
     "node_modules/@firebase/functions-compat": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.3.4.tgz",
-      "integrity": "sha512-kxVxTGyLV1MBR3sp3mI+eQ6JBqz0G5bk310F8eX4HzDFk4xjk5xY0KdHktMH+edM2xs1BOg0vwvvsAHczIjB+w==",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.3.7.tgz",
+      "integrity": "sha512-uXe6Kmku5lNogp3OpPBcOJbSvnaCOn+YxS3zlXKNU6Q/NLwcvO3RY1zwYyctCos2RemEw3KEQ7YdzcECXjHWLw==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/functions": "0.9.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/functions": "0.11.1",
         "@firebase/functions-types": "0.6.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3564,33 +3348,25 @@
       "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.6.0.tgz",
       "integrity": "sha512-hfEw5VJtgWXIRf92ImLkgENqpL6IWpYaXVYiRkFY1jJ9+6tIhWM7IzzwbevwIIud/jaxKVdRzD7QBWfPmkwCYw=="
     },
-    "node_modules/@firebase/functions/node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+    "node_modules/@firebase/functions/node_modules/undici": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz",
+      "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "@fastify/busboy": "^2.0.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">=14.0"
       }
     },
     "node_modules/@firebase/installations": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.4.tgz",
-      "integrity": "sha512-u5y88rtsp7NYkCHC3ElbFBrPtieUybZluXyzl7+4BsIz4sqb4vSAuwHEUgCgCeaQhvsnxDEU6icly8U9zsJigA==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.5.tgz",
+      "integrity": "sha512-0xxnQWw8rSRzu0ZOCkZaO+MJ0LkDAfwwTB2Z1SxRK6FAz5xkxD1ZUwM0WbCRni49PKubCrZYOJ6yg7tSjU7AKA==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/util": "1.9.3",
-        "idb": "7.0.1",
+        "@firebase/component": "0.6.5",
+        "@firebase/util": "1.9.4",
+        "idb": "7.1.1",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3598,14 +3374,14 @@
       }
     },
     "node_modules/@firebase/installations-compat": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@firebase/installations-compat/-/installations-compat-0.2.4.tgz",
-      "integrity": "sha512-LI9dYjp0aT9Njkn9U4JRrDqQ6KXeAmFbRC0E7jI7+hxl5YmRWysq5qgQl22hcWpTk+cm3es66d/apoDU/A9n6Q==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@firebase/installations-compat/-/installations-compat-0.2.5.tgz",
+      "integrity": "sha512-usvoIaog5CHEw082HXLrKAZ1qd4hIC3N/LDe2NqBgI3pkGE/7auLVM4Gn5gvyryp0x8z/IP1+d9fkGUj2OaGLQ==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/installations": "0.6.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/installations": "0.6.5",
         "@firebase/installations-types": "0.5.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3620,11 +3396,6 @@
         "@firebase/app-types": "0.x"
       }
     },
-    "node_modules/@firebase/installations/node_modules/idb": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.1.tgz",
-      "integrity": "sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg=="
-    },
     "node_modules/@firebase/logger": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.0.tgz",
@@ -3634,15 +3405,15 @@
       }
     },
     "node_modules/@firebase/messaging": {
-      "version": "0.12.4",
-      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.4.tgz",
-      "integrity": "sha512-6JLZct6zUaex4g7HI3QbzeUrg9xcnmDAPTWpkoMpd/GoSVWH98zDoWXMGrcvHeCAIsLpFMe4MPoZkJbrPhaASw==",
+      "version": "0.12.6",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.6.tgz",
+      "integrity": "sha512-IORsPp9IPWq4j4yEhTOZ6GAGi3gQwGc+4yexmTAlya+qeBRSdRnJg2iIU/aj+tcKDQYr9RQuQPgHHOdFIx//vA==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/installations": "0.6.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/installations": "0.6.5",
         "@firebase/messaging-interop-types": "0.2.0",
-        "@firebase/util": "1.9.3",
-        "idb": "7.0.1",
+        "@firebase/util": "1.9.4",
+        "idb": "7.1.1",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3650,13 +3421,13 @@
       }
     },
     "node_modules/@firebase/messaging-compat": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.2.4.tgz",
-      "integrity": "sha512-lyFjeUhIsPRYDPNIkYX1LcZMpoVbBWXX4rPl7c/rqc7G+EUea7IEtSt4MxTvh6fDfPuzLn7+FZADfscC+tNMfg==",
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.2.6.tgz",
+      "integrity": "sha512-Q2xC1s4L7Vpss7P7Gy6GuIS+xmJrf/vm9+gX76IK1Bo1TjoKwleCLHt1LHkPz5Rvqg5pTgzzI8qqPhBpZosFCg==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/messaging": "0.12.4",
-        "@firebase/util": "1.9.3",
+        "@firebase/component": "0.6.5",
+        "@firebase/messaging": "0.12.6",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3668,20 +3439,15 @@
       "resolved": "https://registry.npmjs.org/@firebase/messaging-interop-types/-/messaging-interop-types-0.2.0.tgz",
       "integrity": "sha512-ujA8dcRuVeBixGR9CtegfpU4YmZf3Lt7QYkcj693FFannwNuZgfAYaTmbJ40dtjB81SAu6tbFPL9YLNT15KmOQ=="
     },
-    "node_modules/@firebase/messaging/node_modules/idb": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.1.tgz",
-      "integrity": "sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg=="
-    },
     "node_modules/@firebase/performance": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.6.4.tgz",
-      "integrity": "sha512-HfTn/bd8mfy/61vEqaBelNiNnvAbUtME2S25A67Nb34zVuCSCRIX4SseXY6zBnOFj3oLisaEqhVcJmVPAej67g==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.6.5.tgz",
+      "integrity": "sha512-OzAGcWhOqEFH9GdwUuY0oC5FSlnMejcnmSAhR+EjpI7exdDvixyLyCR4txjSHYNTbumrFBG+EP8GO11CNXRaJA==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/installations": "0.6.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/installations": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3689,15 +3455,15 @@
       }
     },
     "node_modules/@firebase/performance-compat": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.2.4.tgz",
-      "integrity": "sha512-nnHUb8uP9G8islzcld/k6Bg5RhX62VpbAb/Anj7IXs/hp32Eb2LqFPZK4sy3pKkBUO5wcrlRWQa6wKOxqlUqsg==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.2.5.tgz",
+      "integrity": "sha512-jJwJkVyDcIMBaVGrZ6CRGs4m5FCZsWB5QCWYI3FdsHyIa9/TfteNDilxj9wGciF2naFIHDW7TgE69U5dAH9Ktg==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/performance": "0.6.4",
+        "@firebase/performance": "0.6.5",
         "@firebase/performance-types": "0.2.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3710,14 +3476,14 @@
       "integrity": "sha512-kYrbr8e/CYr1KLrLYZZt2noNnf+pRwDq2KK9Au9jHrBMnb0/C9X9yWSXmZkFt4UIdsQknBq8uBB7fsybZdOBTA=="
     },
     "node_modules/@firebase/remote-config": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.4.4.tgz",
-      "integrity": "sha512-x1ioTHGX8ZwDSTOVp8PBLv2/wfwKzb4pxi0gFezS5GCJwbLlloUH4YYZHHS83IPxnua8b6l0IXUaWd0RgbWwzQ==",
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.4.5.tgz",
+      "integrity": "sha512-rGLqc/4OmxrS39RA9kgwa6JmgWytQuMo+B8pFhmGp3d++x2Hf9j+MLQfhOLyyUo64fNw20J19mLXhrXvKHsjZQ==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/installations": "0.6.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/installations": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3725,15 +3491,15 @@
       }
     },
     "node_modules/@firebase/remote-config-compat": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.2.4.tgz",
-      "integrity": "sha512-FKiki53jZirrDFkBHglB3C07j5wBpitAaj8kLME6g8Mx+aq7u9P7qfmuSRytiOItADhWUj7O1JIv7n9q87SuwA==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.2.5.tgz",
+      "integrity": "sha512-ImkNnLuGrD/bylBHDJigSY6LMwRrwt37wQbsGZhWG4QQ6KLzHzSf0nnFRRFvkOZodEUE57Ib8l74d6Yn/6TDUQ==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/remote-config": "0.4.4",
+        "@firebase/remote-config": "0.4.5",
         "@firebase/remote-config-types": "0.3.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3746,28 +3512,28 @@
       "integrity": "sha512-RtEH4vdcbXZuZWRZbIRmQVBNsE7VDQpet2qFvq6vwKLBIQRQR5Kh58M4ok3A3US8Sr3rubYnaGqZSurCwI8uMA=="
     },
     "node_modules/@firebase/storage": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.11.2.tgz",
-      "integrity": "sha512-CtvoFaBI4hGXlXbaCHf8humajkbXhs39Nbh6MbNxtwJiCqxPy9iH3D3CCfXAvP0QvAAwmJUTK3+z9a++Kc4nkA==",
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.12.1.tgz",
+      "integrity": "sha512-KJ5NV7FUh54TeTlEjdkTTX60ciCKOp9EqlbLnpdcXUYRJg0Z4810TXbilPc1z7fTIG4iPjtdi95bGE9n4dBX8A==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/util": "1.9.3",
-        "node-fetch": "2.6.7",
-        "tslib": "^2.1.0"
+        "@firebase/component": "0.6.5",
+        "@firebase/util": "1.9.4",
+        "tslib": "^2.1.0",
+        "undici": "5.26.5"
       },
       "peerDependencies": {
         "@firebase/app": "0.x"
       }
     },
     "node_modules/@firebase/storage-compat": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.3.2.tgz",
-      "integrity": "sha512-wvsXlLa9DVOMQJckbDNhXKKxRNNewyUhhbXev3t8kSgoCotd1v3MmqhKKz93ePhDnhHnDs7bYHy+Qa8dRY6BXw==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.3.4.tgz",
+      "integrity": "sha512-Y0m5e2gS/wB9Ioth2X/Sgz76vcxvqgQrCmfa9qwhss/N31kxY2Gks6Frv0nrE18AjVfcSmcfDitqUwxcMOTRSg==",
       "dependencies": {
-        "@firebase/component": "0.6.4",
-        "@firebase/storage": "0.11.2",
+        "@firebase/component": "0.6.5",
+        "@firebase/storage": "0.12.1",
         "@firebase/storage-types": "0.8.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       },
       "peerDependencies": {
@@ -3783,115 +3549,60 @@
         "@firebase/util": "1.x"
       }
     },
-    "node_modules/@firebase/storage/node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+    "node_modules/@firebase/storage/node_modules/undici": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz",
+      "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "@fastify/busboy": "^2.0.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">=14.0"
       }
     },
     "node_modules/@firebase/util": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
-      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.4.tgz",
+      "integrity": "sha512-WLonYmS1FGHT97TsUmRN3qnTh5TeeoJp1Gg5fithzuAgdZOUtsYECfy7/noQ3llaguios8r5BuXSEiK82+UrxQ==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/@firebase/webchannel-wrapper": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.0.tgz",
-      "integrity": "sha512-2I8y+vJVrPfPFJrnRGpao1Qc2Gu7wmYoo5ed2s5zK/DUGgcyY1Yr/xC0YdnKM4pi7rG3HqwW9ehAKUXoTMLdoA=="
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.5.tgz",
+      "integrity": "sha512-eSkJsnhBWv5kCTSU1tSUVl9mpFu+5NXXunZc83le8GMjMlsWwQArSc7cJJ4yl+aDFY0NGLi0AjZWMn1axOrkRg=="
     },
     "node_modules/@googlemaps/markerclusterer": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@googlemaps/markerclusterer/-/markerclusterer-2.0.15.tgz",
-      "integrity": "sha512-/I6Esi5FtyeVHsezN9Kut8zRJoqe7KkTIJXGVqpKFf6BjC7qQ1xRajLMkOz0s8XKgLevbr+KdYjuvmj+LohOGg==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/@googlemaps/markerclusterer/-/markerclusterer-2.5.3.tgz",
+      "integrity": "sha512-x7lX0R5yYOoiNectr10wLgCBasNcXFHiADIBdmn7jQllF2B5ENQw5XtZK+hIw4xnV0Df0xhN4LN98XqA5jaiOw==",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
-        "supercluster": "^7.1.3"
+        "supercluster": "^8.0.1"
       }
     },
     "node_modules/@grpc/grpc-js": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.3.tgz",
-      "integrity": "sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog==",
+      "version": "1.9.14",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.14.tgz",
+      "integrity": "sha512-nOpuzZ2G3IuMFN+UPPpKrC6NsLmWsTqSsm66IRfnBt1D4pwTqE27lmbpcPM+l2Ua4gE7PfjRHI6uedAy7hoXUw==",
       "dependencies": {
-        "@grpc/proto-loader": "^0.7.0",
+        "@grpc/proto-loader": "^0.7.8",
         "@types/node": ">=12.12.47"
       },
       "engines": {
         "node": "^8.13.0 || >=10.10.0"
       }
     },
-    "node_modules/@grpc/grpc-js/node_modules/@grpc/proto-loader": {
-      "version": "0.7.7",
-      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.7.tgz",
-      "integrity": "sha512-1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ==",
-      "dependencies": {
-        "@types/long": "^4.0.1",
-        "lodash.camelcase": "^4.3.0",
-        "long": "^4.0.0",
-        "protobufjs": "^7.0.0",
-        "yargs": "^17.7.2"
-      },
-      "bin": {
-        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@grpc/grpc-js/node_modules/protobufjs": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.3.tgz",
-      "integrity": "sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.4",
-        "@protobufjs/eventemitter": "^1.1.0",
-        "@protobufjs/fetch": "^1.1.0",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/inquire": "^1.1.0",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.0",
-        "@types/node": ">=13.7.0",
-        "long": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@grpc/grpc-js/node_modules/protobufjs/node_modules/long": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
-      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
-    },
     "node_modules/@grpc/proto-loader": {
-      "version": "0.6.13",
-      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.13.tgz",
-      "integrity": "sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==",
+      "version": "0.7.10",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz",
+      "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==",
       "dependencies": {
-        "@types/long": "^4.0.1",
         "lodash.camelcase": "^4.3.0",
-        "long": "^4.0.0",
-        "protobufjs": "^6.11.3",
-        "yargs": "^16.2.0"
+        "long": "^5.0.0",
+        "protobufjs": "^7.2.4",
+        "yargs": "^17.7.2"
       },
       "bin": {
         "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
@@ -3900,31 +3611,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/@grpc/proto-loader/node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@grpc/proto-loader/node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -5382,16 +5068,16 @@
       ]
     },
     "node_modules/@schematics/angular": {
-      "version": "15.2.8",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.8.tgz",
-      "integrity": "sha512-F49IEzCFxQlpaMIgTO/wF1l/CLQKif7VaiDdyiTKOeT22IMmyd61FUmWDyZYfCBqMlvBmvDGx64HaHWes1HYCg==",
+      "version": "17.1.3",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.1.3.tgz",
+      "integrity": "sha512-hmeasOvzmniy6urtzUKhEqGO67iPuLX/dVtkF4nWp2NTtcEKlvcJobNDMc+CTlX4+ZMPVOvmhDMQqrlfekZ+NQ==",
       "dependencies": {
-        "@angular-devkit/core": "15.2.8",
-        "@angular-devkit/schematics": "15.2.8",
+        "@angular-devkit/core": "17.1.3",
+        "@angular-devkit/schematics": "17.1.3",
         "jsonc-parser": "3.2.0"
       },
       "engines": {
-        "node": "^14.20.0 || ^16.13.0 || >=18.10.0",
+        "node": "^18.13.0 || >=20.9.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
@@ -5730,10 +5416,15 @@
         "firebase": "*"
       }
     },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.14",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
+      "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg=="
+    },
     "node_modules/@types/google.maps": {
-      "version": "3.53.1",
-      "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.53.1.tgz",
-      "integrity": "sha512-+7JVpq+kFzTU3TweSz6huYuFedZ4s60WeABaXYU6rDZczdpfoQ5DuZNCDc/eAAcdFJpxMMDpzf3d9YTMNodBFg=="
+      "version": "3.55.3",
+      "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.55.3.tgz",
+      "integrity": "sha512-UF1nfj8h/Vj4wEcdjv5v314HkDB6AWaN34Fr/u+6Oaj+GSRlG+k4c3DnJNKv7S23RvDdvIPt4ON6ONJpzNnarA=="
     },
     "node_modules/@types/http-errors": {
       "version": "2.0.4",
@@ -5753,11 +5444,6 @@
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
       "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
     },
-    "node_modules/@types/long": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
-      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
-    },
     "node_modules/@types/mime": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
@@ -5861,6 +5547,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/supercluster": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz",
+      "integrity": "sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
     "node_modules/@types/triple-beam": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz",
@@ -7241,6 +6935,8 @@
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -7251,6 +6947,8 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -7265,6 +6963,8 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -7275,12 +6975,16 @@
     "node_modules/cliui/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "optional": true,
+      "peer": true
     },
     "node_modules/cliui/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -9068,35 +8772,16 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
-    },
-    "node_modules/figures/node_modules/escape-string-regexp": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
-      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
+    },
+    "node_modules/figures/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">=12"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/file-saver": {
@@ -9288,36 +8973,36 @@
       }
     },
     "node_modules/firebase": {
-      "version": "9.22.0",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.22.0.tgz",
-      "integrity": "sha512-Ay1u8IOfhPh58RFAHF7A9cKHACCgV6uI2bhkzKdkjnV0n2AAxn4tDtdXvJ3BEbfhF4WWBC2dFcEXH8cd14ptaw==",
-      "dependencies": {
-        "@firebase/analytics": "0.10.0",
-        "@firebase/analytics-compat": "0.2.6",
-        "@firebase/app": "0.9.10",
-        "@firebase/app-check": "0.7.0",
-        "@firebase/app-check-compat": "0.3.6",
-        "@firebase/app-compat": "0.2.10",
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-10.8.0.tgz",
+      "integrity": "sha512-UJpC24vw8JFuHEOQyArBGKTUd7+kohLISCzHyn0M/prP0KOTx2io1eyLliEid330QqnWI7FOlPxoU97qecCSfQ==",
+      "dependencies": {
+        "@firebase/analytics": "0.10.1",
+        "@firebase/analytics-compat": "0.2.7",
+        "@firebase/app": "0.9.27",
+        "@firebase/app-check": "0.8.2",
+        "@firebase/app-check-compat": "0.3.9",
+        "@firebase/app-compat": "0.2.27",
         "@firebase/app-types": "0.9.0",
-        "@firebase/auth": "0.23.2",
-        "@firebase/auth-compat": "0.4.2",
-        "@firebase/database": "0.14.4",
-        "@firebase/database-compat": "0.3.4",
-        "@firebase/firestore": "3.12.0",
-        "@firebase/firestore-compat": "0.3.9",
-        "@firebase/functions": "0.9.4",
-        "@firebase/functions-compat": "0.3.4",
-        "@firebase/installations": "0.6.4",
-        "@firebase/installations-compat": "0.2.4",
-        "@firebase/messaging": "0.12.4",
-        "@firebase/messaging-compat": "0.2.4",
-        "@firebase/performance": "0.6.4",
-        "@firebase/performance-compat": "0.2.4",
-        "@firebase/remote-config": "0.4.4",
-        "@firebase/remote-config-compat": "0.2.4",
-        "@firebase/storage": "0.11.2",
-        "@firebase/storage-compat": "0.3.2",
-        "@firebase/util": "1.9.3"
+        "@firebase/auth": "1.6.0",
+        "@firebase/auth-compat": "0.5.2",
+        "@firebase/database": "1.0.3",
+        "@firebase/database-compat": "1.0.3",
+        "@firebase/firestore": "4.4.2",
+        "@firebase/firestore-compat": "0.3.25",
+        "@firebase/functions": "0.11.1",
+        "@firebase/functions-compat": "0.3.7",
+        "@firebase/installations": "0.6.5",
+        "@firebase/installations-compat": "0.2.5",
+        "@firebase/messaging": "0.12.6",
+        "@firebase/messaging-compat": "0.2.6",
+        "@firebase/performance": "0.6.5",
+        "@firebase/performance-compat": "0.2.5",
+        "@firebase/remote-config": "0.4.5",
+        "@firebase/remote-config-compat": "0.2.5",
+        "@firebase/storage": "0.12.1",
+        "@firebase/storage-compat": "0.3.4",
+        "@firebase/util": "1.9.4"
       }
     },
     "node_modules/flat": {
@@ -11675,9 +11360,9 @@
       }
     },
     "node_modules/kdbush": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz",
-      "integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew=="
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
+      "integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA=="
     },
     "node_modules/keyv": {
       "version": "3.1.0",
@@ -12048,9 +11733,9 @@
       }
     },
     "node_modules/long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
     },
     "node_modules/lowercase-keys": {
       "version": "1.0.1",
@@ -12070,11 +11755,11 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz",
-      "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==",
+      "version": "0.30.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       },
       "engines": {
         "node": ">=12"
@@ -12713,30 +12398,6 @@
         "rxjs": ">=6.0.0"
       }
     },
-    "node_modules/ngx-auth-firebaseui": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/ngx-auth-firebaseui/-/ngx-auth-firebaseui-7.1.0.tgz",
-      "integrity": "sha512-fHwVhdBkvxsNWpN4zKwcqq82WsdEB5xXNxNVhvayajK1OdaEK6LaCLZFycIhS/mfy5X3ufN1rIf4ctX2QK846w==",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "@angular-material-extensions/password-strength": "^11.x",
-        "@angular/animations": "^14.x",
-        "@angular/cdk": "^14.0.0",
-        "@angular/common": "^14.x",
-        "@angular/core": "^14.x",
-        "@angular/fire": "^7.x",
-        "@angular/flex-layout": "^14.0.0-beta.41",
-        "@angular/forms": "^14.x",
-        "@angular/material": "^14.0.0",
-        "@angular/router": "^14.x",
-        "firebase": "^9.x"
-      }
-    },
     "node_modules/ngx-filesaver": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/ngx-filesaver/-/ngx-filesaver-14.0.0.tgz",
@@ -14010,9 +13671,9 @@
       }
     },
     "node_modules/protobufjs": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
-      "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==",
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.6.tgz",
+      "integrity": "sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==",
       "hasInstallScript": true,
       "dependencies": {
         "@protobufjs/aspromise": "^1.1.2",
@@ -14025,13 +13686,11 @@
         "@protobufjs/path": "^1.1.2",
         "@protobufjs/pool": "^1.1.0",
         "@protobufjs/utf8": "^1.1.0",
-        "@types/long": "^4.0.1",
         "@types/node": ">=13.7.0",
-        "long": "^4.0.0"
+        "long": "^5.0.0"
       },
-      "bin": {
-        "pbjs": "bin/pbjs",
-        "pbts": "bin/pbts"
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
     "node_modules/protractor": {
@@ -15048,22 +14707,14 @@
       }
     },
     "node_modules/rxfire": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/rxfire/-/rxfire-6.0.3.tgz",
-      "integrity": "sha512-77nkyffHh7jgfi1YA/N9RI+kWxYpgKk6GRML1lyersvaqbJt4hkvWwk1rWib9Rb5Lr5mT+Ha45lu7nM79sJCZA==",
-      "dependencies": {
-        "tslib": "^1.9.0 || ~2.1.0"
-      },
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/rxfire/-/rxfire-6.0.5.tgz",
+      "integrity": "sha512-ycBsANGbya3GNtOBKzZVATLEV+0S9gUrlTfwnN15TCXtgG8OgIMAuv2k9+kMeVaevp/DRp1KT+vYf6Wkop6gvw==",
       "peerDependencies": {
-        "firebase": "^9.0.0",
+        "firebase": "^9.0.0 || ^10.0.0",
         "rxjs": "^6.0.0 || ^7.0.0"
       }
     },
-    "node_modules/rxfire/node_modules/tslib": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
-    },
     "node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -16176,11 +15827,11 @@
       }
     },
     "node_modules/supercluster": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz",
-      "integrity": "sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz",
+      "integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==",
       "dependencies": {
-        "kdbush": "^3.0.0"
+        "kdbush": "^4.0.2"
       }
     },
     "node_modules/supports-color": {
@@ -18954,26 +18605,6 @@
       "requires": {
         "@angular-devkit/core": "17.1.3",
         "rxjs": "7.8.1"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "17.1.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.1.3.tgz",
-          "integrity": "sha512-iuVK4hyW3YhusxIi8zGBvvVA9pWtDT3H6LQbWdVk9D3jXCZBIrEMklvAiJErqficKnUurf6gtFOeA8Fop6GotA==",
-          "requires": {
-            "ajv": "8.12.0",
-            "ajv-formats": "2.1.1",
-            "jsonc-parser": "3.2.0",
-            "picomatch": "3.0.1",
-            "rxjs": "7.8.1",
-            "source-map": "0.7.4"
-          }
-        },
-        "picomatch": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-          "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag=="
-        }
       }
     },
     "@angular-devkit/build-angular": {
@@ -19048,19 +18679,6 @@
         "webpack-subresource-integrity": "5.1.0"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "17.1.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.1.3.tgz",
-          "integrity": "sha512-iuVK4hyW3YhusxIi8zGBvvVA9pWtDT3H6LQbWdVk9D3jXCZBIrEMklvAiJErqficKnUurf6gtFOeA8Fop6GotA==",
-          "requires": {
-            "ajv": "8.12.0",
-            "ajv-formats": "2.1.1",
-            "jsonc-parser": "3.2.0",
-            "picomatch": "3.0.1",
-            "rxjs": "7.8.1",
-            "source-map": "0.7.4"
-          }
-        },
         "@babel/core": {
           "version": "7.23.7",
           "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz",
@@ -19120,14 +18738,6 @@
             "yallist": "^4.0.0"
           }
         },
-        "magic-string": {
-          "version": "0.30.5",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-          "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
-          "requires": {
-            "@jridgewell/sourcemap-codec": "^1.4.15"
-          }
-        },
         "picomatch": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
@@ -19174,66 +18784,35 @@
       }
     },
     "@angular-devkit/core": {
-      "version": "15.2.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.8.tgz",
-      "integrity": "sha512-Lo4XrbDMtXarKnMrFgWLmQdSX+3QPNAg4otG8cmp/U4jJyjV4dAYKEAsb1sCNGUSM4h4v09EQU/5ugVjDU29lQ==",
+      "version": "17.1.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.1.3.tgz",
+      "integrity": "sha512-iuVK4hyW3YhusxIi8zGBvvVA9pWtDT3H6LQbWdVk9D3jXCZBIrEMklvAiJErqficKnUurf6gtFOeA8Fop6GotA==",
       "requires": {
         "ajv": "8.12.0",
         "ajv-formats": "2.1.1",
         "jsonc-parser": "3.2.0",
-        "rxjs": "6.6.7",
+        "picomatch": "3.0.1",
+        "rxjs": "7.8.1",
         "source-map": "0.7.4"
       },
       "dependencies": {
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        "picomatch": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
+          "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag=="
         }
       }
     },
     "@angular-devkit/schematics": {
-      "version": "15.2.8",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.8.tgz",
-      "integrity": "sha512-w6EUGC96kVsH9f8sEzajzbONMawezyVBiSo+JYp5r25rQArAz/a+KZntbuETWHQ0rQOEsKmUNKxwmr11BaptSQ==",
+      "version": "17.1.3",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.1.3.tgz",
+      "integrity": "sha512-zKoWG1hDfvi1vR9Hqoca9hWo9vDg8evmQvGcBW5jXR5ndZi5Oit/uDcGdA8WUKvBd1EG7WMqp0FgcDR9EA9WCw==",
       "requires": {
-        "@angular-devkit/core": "15.2.8",
+        "@angular-devkit/core": "17.1.3",
         "jsonc-parser": "3.2.0",
-        "magic-string": "0.29.0",
+        "magic-string": "0.30.5",
         "ora": "5.4.1",
-        "rxjs": "6.6.7"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
-      }
-    },
-    "@angular-material-extensions/password-strength": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/@angular-material-extensions/password-strength/-/password-strength-11.0.1.tgz",
-      "integrity": "sha512-ZKZ7jvMkWH4NiuU0skvhVK02n1CgPW4PvTRHgX0tnz6380bDwmChu8t1hf+rAeExPcehC2rBq0mU6j0+tDfrmw==",
-      "peer": true,
-      "requires": {
-        "tslib": "^2.0.0"
+        "rxjs": "7.8.1"
       }
     },
     "@angular/animations": {
@@ -19279,44 +18858,6 @@
         "yargs": "17.7.2"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "17.1.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.1.3.tgz",
-          "integrity": "sha512-iuVK4hyW3YhusxIi8zGBvvVA9pWtDT3H6LQbWdVk9D3jXCZBIrEMklvAiJErqficKnUurf6gtFOeA8Fop6GotA==",
-          "dev": true,
-          "requires": {
-            "ajv": "8.12.0",
-            "ajv-formats": "2.1.1",
-            "jsonc-parser": "3.2.0",
-            "picomatch": "3.0.1",
-            "rxjs": "7.8.1",
-            "source-map": "0.7.4"
-          }
-        },
-        "@angular-devkit/schematics": {
-          "version": "17.1.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.1.3.tgz",
-          "integrity": "sha512-zKoWG1hDfvi1vR9Hqoca9hWo9vDg8evmQvGcBW5jXR5ndZi5Oit/uDcGdA8WUKvBd1EG7WMqp0FgcDR9EA9WCw==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "17.1.3",
-            "jsonc-parser": "3.2.0",
-            "magic-string": "0.30.5",
-            "ora": "5.4.1",
-            "rxjs": "7.8.1"
-          }
-        },
-        "@schematics/angular": {
-          "version": "17.1.3",
-          "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.1.3.tgz",
-          "integrity": "sha512-hmeasOvzmniy6urtzUKhEqGO67iPuLX/dVtkF4nWp2NTtcEKlvcJobNDMc+CTlX4+ZMPVOvmhDMQqrlfekZ+NQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "17.1.3",
-            "@angular-devkit/schematics": "17.1.3",
-            "jsonc-parser": "3.2.0"
-          }
-        },
         "lru-cache": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -19326,21 +18867,6 @@
             "yallist": "^4.0.0"
           }
         },
-        "magic-string": {
-          "version": "0.30.5",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-          "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/sourcemap-codec": "^1.4.15"
-          }
-        },
-        "picomatch": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-          "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
-          "dev": true
-        },
         "semver": {
           "version": "7.5.4",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
@@ -19398,14 +18924,13 @@
       }
     },
     "@angular/fire": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@angular/fire/-/fire-7.5.0.tgz",
-      "integrity": "sha512-M/JJ5SKnpfNZFLKl0Awjn3r2NhURy2Mx+E8EzSDWSg1sHD7IThrynZYPUSZR+cd3KGsGoEacIP2x8Ra+0a+CVg==",
-      "requires": {
-        "@angular-devkit/schematics": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
-        "@schematics/angular": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
-        "file-loader": "^6.2.0",
-        "firebase": "^9.8.0",
+      "version": "17.0.1",
+      "resolved": "https://registry.npmjs.org/@angular/fire/-/fire-17.0.1.tgz",
+      "integrity": "sha512-bhbogL4m50AKzSVn4kdZX3/2XrYTMvpsgP/4xnTPuMoTFgOrjV24CDc+1lOL+Z0QXRIupj84/Pg4KNFD4lXXzQ==",
+      "requires": {
+        "@angular-devkit/schematics": "^17.0.0",
+        "@schematics/angular": "^17.0.0",
+        "firebase": "^10.7.0",
         "fs-extra": "^8.0.1",
         "fuzzy": "^0.1.3",
         "inquirer": "^8.1.1",
@@ -19414,10 +18939,10 @@
         "node-fetch": "^2.6.1",
         "open": "^8.0.0",
         "ora": "^5.3.0",
-        "rxfire": "^6.0.0",
+        "rxfire": "^6.0.5",
         "semver": "^7.1.3",
         "triple-beam": "^1.3.0",
-        "tslib": "^2.0.0",
+        "tslib": "^2.3.0",
         "winston": "^3.0.0"
       },
       "dependencies": {
@@ -19565,9 +19090,9 @@
       }
     },
     "@angular/google-maps": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/@angular/google-maps/-/google-maps-16.0.1.tgz",
-      "integrity": "sha512-+0XS6CExQgKO+NT3SsGw+moecOud0KylYmQfAVK+klG5Fizni+PQK+AaaCvD8srnv/QbXApiSjuLXO8iK4YAyg==",
+      "version": "17.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/google-maps/-/google-maps-17.1.2.tgz",
+      "integrity": "sha512-XPURw4m36fU3KQHzZSM5Ubz83GB3zgt5J8WrDTsGM1hwtVk+onQEkMjYfSRl8cbIChOYigvnkm4bckxu6Y/8hA==",
       "requires": {
         "@types/google.maps": "^3.52.4",
         "tslib": "^2.3.0"
@@ -20962,26 +20487,26 @@
       "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA=="
     },
     "@firebase/analytics": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.0.tgz",
-      "integrity": "sha512-Locv8gAqx0e+GX/0SI3dzmBY5e9kjVDtD+3zCFLJ0tH2hJwuCAiL+5WkHuxKj92rqQj/rvkBUCfA1ewlX2hehg==",
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.1.tgz",
+      "integrity": "sha512-5mnH1aQa99J5lZMJwTNzIoRc4yGXHf+fOn+EoEWhCDA3XGPweGHcylCbqq+G1wVJmfILL57fohDMa8ftMZ+44g==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/installations": "0.6.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/installations": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
     "@firebase/analytics-compat": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.6.tgz",
-      "integrity": "sha512-4MqpVLFkGK7NJf/5wPEEP7ePBJatwYpyjgJ+wQHQGHfzaCDgntOnl9rL2vbVGGKCnRqWtZDIWhctB86UWXaX2Q==",
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.2.7.tgz",
+      "integrity": "sha512-17VCly4P0VFBDqaaal7m1nhyYQwsygtaTpSsnc51sFPRrr9XIYtnD8ficon9fneEGEoJQ2g7OtASvhwX9EbK8g==",
       "requires": {
-        "@firebase/analytics": "0.10.0",
+        "@firebase/analytics": "0.10.1",
         "@firebase/analytics-types": "0.8.0",
-        "@firebase/component": "0.6.4",
-        "@firebase/util": "1.9.3",
+        "@firebase/component": "0.6.5",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
@@ -20991,45 +20516,45 @@
       "integrity": "sha512-iRP+QKI2+oz3UAh4nPEq14CsEjrjD6a5+fuypjScisAh9kXKFvdJOZJDwk7kikLvWVLGEs9+kIUS4LPQV7VZVw=="
     },
     "@firebase/app": {
-      "version": "0.9.10",
-      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.9.10.tgz",
-      "integrity": "sha512-2aLHuPLrjgxds95e2JpuAb29pBGArihHwjdJBUKtJnSxxEdwxAsGuXzSrOrmzYXlAwxUTZkOD6Cbl/dfTTwhKA==",
+      "version": "0.9.27",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.9.27.tgz",
+      "integrity": "sha512-p2Dvl1ge4kRsyK5+wWcmdAIE9MSwZ0pDKAYB51LZgZuz6wciUZk4E1yAEdkfQlRxuHehn+Ol9WP5Qk2XQZiHGg==",
       "requires": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "idb": "7.1.1",
         "tslib": "^2.1.0"
       }
     },
     "@firebase/app-check": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.7.0.tgz",
-      "integrity": "sha512-y0raLJpEtiL+wonfInFMaSfBV/EDvr356ZHMWbpr5F7fR0/I3cC0h7U6SKpKhrbSHJ0fOYIe0xbih20KTlpcnA==",
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.8.2.tgz",
+      "integrity": "sha512-A2B5+ldOguYAeqW1quFN5qNdruSNRrg4W59ag1Eq6QzxuHNIkrE+TrapfrW/z5NYFjCxAYqr/unVCgmk80Dwcg==",
       "requires": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
     "@firebase/app-check-compat": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.6.tgz",
-      "integrity": "sha512-azHAeHi9igoaIo04E6Yfuc7aIbWoWuBXuqjyYyWbeCc8Zz/NfJvIAgmXugN4LdxsHJ7XGlZTvwJ6YaYROdSa7A==",
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.3.9.tgz",
+      "integrity": "sha512-7LxyupQ8XeEHRh72mO+tqm69kHT6KbWi2KtFMGedJ6tNbwzFzojcXESMKN8RpADXbYoQgY3loWMJjMx4r2Zt7w==",
       "requires": {
-        "@firebase/app-check": "0.7.0",
+        "@firebase/app-check": "0.8.2",
         "@firebase/app-check-types": "0.5.0",
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
     "@firebase/app-check-interop-types": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.2.0.tgz",
-      "integrity": "sha512-+3PQIeX6/eiVK+x/yg8r6xTNR97fN7MahFDm+jiQmDjcyvSefoGuTTNQuuMScGyx3vYUBeZn+Cp9kC0yY/9uxQ=="
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app-check-interop-types/-/app-check-interop-types-0.3.0.tgz",
+      "integrity": "sha512-xAxHPZPIgFXnI+vb4sbBjZcde7ZluzPPaSK7Lx3/nmuVk4TjZvnL8ONnkd4ERQKL8WePQySU+pRcWkh8rDf5Sg=="
     },
     "@firebase/app-check-types": {
       "version": "0.5.0",
@@ -21037,14 +20562,14 @@
       "integrity": "sha512-uwSUj32Mlubybw7tedRzR24RP8M8JUVR3NPiMk3/Z4bCmgEKTlQBwMXrehDAZ2wF+TsBq0SN1c6ema71U/JPyQ=="
     },
     "@firebase/app-compat": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.10.tgz",
-      "integrity": "sha512-kulrAW9JKkWeLeXKYjipCh60MmZcRC626NYpNWKxnjZ3YsVk6vgMuM+BHvhHQVp0fgfOq3hMNp5tyhlAB1Q1EQ==",
+      "version": "0.2.27",
+      "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.27.tgz",
+      "integrity": "sha512-SYlqocfUDKPHR6MSFC8hree0BTiWFu5o8wbf6zFlYXyG41w7TcHp4wJi4H/EL5V6cM4kxwruXTJtqXX/fRAZtw==",
       "requires": {
-        "@firebase/app": "0.9.10",
-        "@firebase/component": "0.6.4",
+        "@firebase/app": "0.9.27",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
@@ -21054,46 +20579,46 @@
       "integrity": "sha512-AeweANOIo0Mb8GiYm3xhTEBVCmPwTYAu9Hcd2qSkLuga/6+j9b1Jskl5bpiSQWy9eJ/j5pavxj6eYogmnuzm+Q=="
     },
     "@firebase/auth": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.23.2.tgz",
-      "integrity": "sha512-dM9iJ0R6tI1JczuGSxXmQbXAgtYie0K4WvKcuyuSTCu9V8eEDiz4tfa1sO3txsfvwg7nOY3AjoCyMYEdqZ8hdg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.6.0.tgz",
+      "integrity": "sha512-Qhl35eJTV6BwvuueTPCY6x8kUlYyzALtjp/Ws0X3fw3AnjVVfuVb7oQ3Xh5VPVfMFhaIuUAd1KXwcAuIklkSDw==",
       "requires": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
-        "node-fetch": "2.6.7",
-        "tslib": "^2.1.0"
+        "@firebase/util": "1.9.4",
+        "tslib": "^2.1.0",
+        "undici": "5.26.5"
       },
       "dependencies": {
-        "node-fetch": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+        "undici": {
+          "version": "5.26.5",
+          "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz",
+          "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==",
           "requires": {
-            "whatwg-url": "^5.0.0"
+            "@fastify/busboy": "^2.0.0"
           }
         }
       }
     },
     "@firebase/auth-compat": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.4.2.tgz",
-      "integrity": "sha512-Q30e77DWXFmXEt5dg5JbqEDpjw9y3/PcP9LslDPR7fARmAOTIY9MM6HXzm9KC+dlrKH/+p6l8g9ifJiam9mc4A==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.5.2.tgz",
+      "integrity": "sha512-pRgje5BPCNR1vXyvGOVXwOHtv88A2WooXfklI8sV7/jWi03ExFqNfpJT26GUo/oD39NoKJ3Kt6rD5gVvdV7lMw==",
       "requires": {
-        "@firebase/auth": "0.23.2",
+        "@firebase/auth": "1.6.0",
         "@firebase/auth-types": "0.12.0",
-        "@firebase/component": "0.6.4",
-        "@firebase/util": "1.9.3",
-        "node-fetch": "2.6.7",
-        "tslib": "^2.1.0"
+        "@firebase/component": "0.6.5",
+        "@firebase/util": "1.9.4",
+        "tslib": "^2.1.0",
+        "undici": "5.26.5"
       },
       "dependencies": {
-        "node-fetch": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+        "undici": {
+          "version": "5.26.5",
+          "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz",
+          "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==",
           "requires": {
-            "whatwg-url": "^5.0.0"
+            "@fastify/busboy": "^2.0.0"
           }
         }
       }
@@ -21110,125 +20635,126 @@
       "requires": {}
     },
     "@firebase/component": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.4.tgz",
-      "integrity": "sha512-rLMyrXuO9jcAUCaQXCMjCMUsWrba5fzHlNK24xz5j2W6A/SRmK8mZJ/hn7V0fViLbxC0lPMtrK1eYzk6Fg03jA==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.5.tgz",
+      "integrity": "sha512-2tVDk1ixi12sbDmmfITK8lxSjmcb73BMF6Qwc3U44hN/J1Fi1QY/Hnnb6klFlbB9/G16a3J3d4nXykye2EADTw==",
       "requires": {
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
     "@firebase/database": {
-      "version": "0.14.4",
-      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.14.4.tgz",
-      "integrity": "sha512-+Ea/IKGwh42jwdjCyzTmeZeLM3oy1h0mFPsTy6OqCWzcu/KFqRAr5Tt1HRCOBlNOdbh84JPZC47WLU18n2VbxQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.3.tgz",
+      "integrity": "sha512-9fjqLt9JzL46gw9+NRqsgQEMjgRwfd8XtzcKqG+UYyhVeFCdVRQ0Wp6Dw/dvYHnbH5vNEKzNv36dcB4p+PIAAA==",
       "requires": {
+        "@firebase/app-check-interop-types": "0.3.0",
         "@firebase/auth-interop-types": "0.2.1",
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "faye-websocket": "0.11.4",
         "tslib": "^2.1.0"
       }
     },
     "@firebase/database-compat": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.3.4.tgz",
-      "integrity": "sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-1.0.3.tgz",
+      "integrity": "sha512-7tHEOcMbK5jJzHWyphPux4osogH/adWwncxdMxdBpB9g1DNIyY4dcz1oJdlkXGM/i/AjUBesZsd5CuwTRTBNTw==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/database": "0.14.4",
-        "@firebase/database-types": "0.10.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/database": "1.0.3",
+        "@firebase/database-types": "1.0.1",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
     "@firebase/database-types": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.10.4.tgz",
-      "integrity": "sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.1.tgz",
+      "integrity": "sha512-Tmcmx5XgiI7UVF/4oGg2P3AOTfq3WKEPsm2yf+uXtN7uG/a4WTWhVMrXGYRY2ZUL1xPxv9V33wQRJ+CcrUhVXw==",
       "requires": {
         "@firebase/app-types": "0.9.0",
-        "@firebase/util": "1.9.3"
+        "@firebase/util": "1.9.4"
       }
     },
     "@firebase/firestore": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.12.0.tgz",
-      "integrity": "sha512-mZdwIJBOIAdkaykqZqMYQZldSH19gf7u1Y77UVxh4igm1zaG8ZiGE8qYVXQ/vGc+BvvUZ8OpnqLI5Z0JSJtDIg==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.4.2.tgz",
+      "integrity": "sha512-YaX6ypa/RzU6OkxzUQlpSxwhOIWdTraCNz7sMsbaSEjjl/pj/QvX6TqjkdWGzuBYh2S6rz7ErhDO0g39oZZw/g==",
       "requires": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
-        "@firebase/webchannel-wrapper": "0.10.0",
-        "@grpc/grpc-js": "~1.7.0",
-        "@grpc/proto-loader": "^0.6.13",
-        "node-fetch": "2.6.7",
-        "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "node-fetch": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+        "@firebase/util": "1.9.4",
+        "@firebase/webchannel-wrapper": "0.10.5",
+        "@grpc/grpc-js": "~1.9.0",
+        "@grpc/proto-loader": "^0.7.8",
+        "tslib": "^2.1.0",
+        "undici": "5.26.5"
+      },
+      "dependencies": {
+        "undici": {
+          "version": "5.26.5",
+          "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz",
+          "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==",
           "requires": {
-            "whatwg-url": "^5.0.0"
+            "@fastify/busboy": "^2.0.0"
           }
         }
       }
     },
     "@firebase/firestore-compat": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.3.9.tgz",
-      "integrity": "sha512-u4fGeuaDaMnAPp20PAm6vrhktVGCtfmC3iup5ymMkOUNIqbuQ/+WLL3zUlJi+Ytl4hX0vVNg4UQEh4vfMorc4Q==",
-      "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/firestore": "3.12.0",
-        "@firebase/firestore-types": "2.5.1",
-        "@firebase/util": "1.9.3",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.3.25.tgz",
+      "integrity": "sha512-+xI7WmsgZCBhMn/+uhDKcg+lsOUJ9FJyt5PGTzkFPbCsozWfeQZ7eVnfPh0rMkUOf0yIQ924RIe04gwvEIbcoQ==",
+      "requires": {
+        "@firebase/component": "0.6.5",
+        "@firebase/firestore": "4.4.2",
+        "@firebase/firestore-types": "3.0.0",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
     "@firebase/firestore-types": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-2.5.1.tgz",
-      "integrity": "sha512-xG0CA6EMfYo8YeUxC8FeDzf6W3FX1cLlcAGBYV6Cku12sZRI81oWcu61RSKM66K6kUENP+78Qm8mvroBcm1whw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore-types/-/firestore-types-3.0.0.tgz",
+      "integrity": "sha512-Meg4cIezHo9zLamw0ymFYBD4SMjLb+ZXIbuN7T7ddXN6MGoICmOTq3/ltdCGoDCS2u+H1XJs2u/cYp75jsX9Qw==",
       "requires": {}
     },
     "@firebase/functions": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.9.4.tgz",
-      "integrity": "sha512-3H2qh6U+q+nepO5Hds+Ddl6J0pS+zisuBLqqQMRBHv9XpWfu0PnDHklNmE8rZ+ccTEXvBj6zjkPfdxt6NisvlQ==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.11.1.tgz",
+      "integrity": "sha512-3uUa1hB79Gmy6E1gHTfzoHeZolBeHc/I/n3+lOCDe6BOos9AHmzRjKygcFE/7VA2FJjitCE0K+OHI6+OuoY8fQ==",
       "requires": {
-        "@firebase/app-check-interop-types": "0.2.0",
+        "@firebase/app-check-interop-types": "0.3.0",
         "@firebase/auth-interop-types": "0.2.1",
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/messaging-interop-types": "0.2.0",
-        "@firebase/util": "1.9.3",
-        "node-fetch": "2.6.7",
-        "tslib": "^2.1.0"
+        "@firebase/util": "1.9.4",
+        "tslib": "^2.1.0",
+        "undici": "5.26.5"
       },
       "dependencies": {
-        "node-fetch": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+        "undici": {
+          "version": "5.26.5",
+          "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz",
+          "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==",
           "requires": {
-            "whatwg-url": "^5.0.0"
+            "@fastify/busboy": "^2.0.0"
           }
         }
       }
     },
     "@firebase/functions-compat": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.3.4.tgz",
-      "integrity": "sha512-kxVxTGyLV1MBR3sp3mI+eQ6JBqz0G5bk310F8eX4HzDFk4xjk5xY0KdHktMH+edM2xs1BOg0vwvvsAHczIjB+w==",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.3.7.tgz",
+      "integrity": "sha512-uXe6Kmku5lNogp3OpPBcOJbSvnaCOn+YxS3zlXKNU6Q/NLwcvO3RY1zwYyctCos2RemEw3KEQ7YdzcECXjHWLw==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/functions": "0.9.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/functions": "0.11.1",
         "@firebase/functions-types": "0.6.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
@@ -21238,32 +20764,25 @@
       "integrity": "sha512-hfEw5VJtgWXIRf92ImLkgENqpL6IWpYaXVYiRkFY1jJ9+6tIhWM7IzzwbevwIIud/jaxKVdRzD7QBWfPmkwCYw=="
     },
     "@firebase/installations": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.4.tgz",
-      "integrity": "sha512-u5y88rtsp7NYkCHC3ElbFBrPtieUybZluXyzl7+4BsIz4sqb4vSAuwHEUgCgCeaQhvsnxDEU6icly8U9zsJigA==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.5.tgz",
+      "integrity": "sha512-0xxnQWw8rSRzu0ZOCkZaO+MJ0LkDAfwwTB2Z1SxRK6FAz5xkxD1ZUwM0WbCRni49PKubCrZYOJ6yg7tSjU7AKA==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/util": "1.9.3",
-        "idb": "7.0.1",
+        "@firebase/component": "0.6.5",
+        "@firebase/util": "1.9.4",
+        "idb": "7.1.1",
         "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "idb": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.1.tgz",
-          "integrity": "sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg=="
-        }
       }
     },
     "@firebase/installations-compat": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@firebase/installations-compat/-/installations-compat-0.2.4.tgz",
-      "integrity": "sha512-LI9dYjp0aT9Njkn9U4JRrDqQ6KXeAmFbRC0E7jI7+hxl5YmRWysq5qgQl22hcWpTk+cm3es66d/apoDU/A9n6Q==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@firebase/installations-compat/-/installations-compat-0.2.5.tgz",
+      "integrity": "sha512-usvoIaog5CHEw082HXLrKAZ1qd4hIC3N/LDe2NqBgI3pkGE/7auLVM4Gn5gvyryp0x8z/IP1+d9fkGUj2OaGLQ==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/installations": "0.6.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/installations": "0.6.5",
         "@firebase/installations-types": "0.5.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
@@ -21282,33 +20801,26 @@
       }
     },
     "@firebase/messaging": {
-      "version": "0.12.4",
-      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.4.tgz",
-      "integrity": "sha512-6JLZct6zUaex4g7HI3QbzeUrg9xcnmDAPTWpkoMpd/GoSVWH98zDoWXMGrcvHeCAIsLpFMe4MPoZkJbrPhaASw==",
+      "version": "0.12.6",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.6.tgz",
+      "integrity": "sha512-IORsPp9IPWq4j4yEhTOZ6GAGi3gQwGc+4yexmTAlya+qeBRSdRnJg2iIU/aj+tcKDQYr9RQuQPgHHOdFIx//vA==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/installations": "0.6.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/installations": "0.6.5",
         "@firebase/messaging-interop-types": "0.2.0",
-        "@firebase/util": "1.9.3",
-        "idb": "7.0.1",
+        "@firebase/util": "1.9.4",
+        "idb": "7.1.1",
         "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "idb": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.1.tgz",
-          "integrity": "sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg=="
-        }
       }
     },
     "@firebase/messaging-compat": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.2.4.tgz",
-      "integrity": "sha512-lyFjeUhIsPRYDPNIkYX1LcZMpoVbBWXX4rPl7c/rqc7G+EUea7IEtSt4MxTvh6fDfPuzLn7+FZADfscC+tNMfg==",
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.2.6.tgz",
+      "integrity": "sha512-Q2xC1s4L7Vpss7P7Gy6GuIS+xmJrf/vm9+gX76IK1Bo1TjoKwleCLHt1LHkPz5Rvqg5pTgzzI8qqPhBpZosFCg==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/messaging": "0.12.4",
-        "@firebase/util": "1.9.3",
+        "@firebase/component": "0.6.5",
+        "@firebase/messaging": "0.12.6",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
@@ -21318,27 +20830,27 @@
       "integrity": "sha512-ujA8dcRuVeBixGR9CtegfpU4YmZf3Lt7QYkcj693FFannwNuZgfAYaTmbJ40dtjB81SAu6tbFPL9YLNT15KmOQ=="
     },
     "@firebase/performance": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.6.4.tgz",
-      "integrity": "sha512-HfTn/bd8mfy/61vEqaBelNiNnvAbUtME2S25A67Nb34zVuCSCRIX4SseXY6zBnOFj3oLisaEqhVcJmVPAej67g==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.6.5.tgz",
+      "integrity": "sha512-OzAGcWhOqEFH9GdwUuY0oC5FSlnMejcnmSAhR+EjpI7exdDvixyLyCR4txjSHYNTbumrFBG+EP8GO11CNXRaJA==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/installations": "0.6.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/installations": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
     "@firebase/performance-compat": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.2.4.tgz",
-      "integrity": "sha512-nnHUb8uP9G8islzcld/k6Bg5RhX62VpbAb/Anj7IXs/hp32Eb2LqFPZK4sy3pKkBUO5wcrlRWQa6wKOxqlUqsg==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.2.5.tgz",
+      "integrity": "sha512-jJwJkVyDcIMBaVGrZ6CRGs4m5FCZsWB5QCWYI3FdsHyIa9/TfteNDilxj9wGciF2naFIHDW7TgE69U5dAH9Ktg==",
       "requires": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/performance": "0.6.4",
+        "@firebase/performance": "0.6.5",
         "@firebase/performance-types": "0.2.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
@@ -21348,27 +20860,27 @@
       "integrity": "sha512-kYrbr8e/CYr1KLrLYZZt2noNnf+pRwDq2KK9Au9jHrBMnb0/C9X9yWSXmZkFt4UIdsQknBq8uBB7fsybZdOBTA=="
     },
     "@firebase/remote-config": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.4.4.tgz",
-      "integrity": "sha512-x1ioTHGX8ZwDSTOVp8PBLv2/wfwKzb4pxi0gFezS5GCJwbLlloUH4YYZHHS83IPxnua8b6l0IXUaWd0RgbWwzQ==",
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.4.5.tgz",
+      "integrity": "sha512-rGLqc/4OmxrS39RA9kgwa6JmgWytQuMo+B8pFhmGp3d++x2Hf9j+MLQfhOLyyUo64fNw20J19mLXhrXvKHsjZQ==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/installations": "0.6.4",
+        "@firebase/component": "0.6.5",
+        "@firebase/installations": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
     "@firebase/remote-config-compat": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.2.4.tgz",
-      "integrity": "sha512-FKiki53jZirrDFkBHglB3C07j5wBpitAaj8kLME6g8Mx+aq7u9P7qfmuSRytiOItADhWUj7O1JIv7n9q87SuwA==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.2.5.tgz",
+      "integrity": "sha512-ImkNnLuGrD/bylBHDJigSY6LMwRrwt37wQbsGZhWG4QQ6KLzHzSf0nnFRRFvkOZodEUE57Ib8l74d6Yn/6TDUQ==",
       "requires": {
-        "@firebase/component": "0.6.4",
+        "@firebase/component": "0.6.5",
         "@firebase/logger": "0.4.0",
-        "@firebase/remote-config": "0.4.4",
+        "@firebase/remote-config": "0.4.5",
         "@firebase/remote-config-types": "0.3.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
@@ -21378,35 +20890,35 @@
       "integrity": "sha512-RtEH4vdcbXZuZWRZbIRmQVBNsE7VDQpet2qFvq6vwKLBIQRQR5Kh58M4ok3A3US8Sr3rubYnaGqZSurCwI8uMA=="
     },
     "@firebase/storage": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.11.2.tgz",
-      "integrity": "sha512-CtvoFaBI4hGXlXbaCHf8humajkbXhs39Nbh6MbNxtwJiCqxPy9iH3D3CCfXAvP0QvAAwmJUTK3+z9a++Kc4nkA==",
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.12.1.tgz",
+      "integrity": "sha512-KJ5NV7FUh54TeTlEjdkTTX60ciCKOp9EqlbLnpdcXUYRJg0Z4810TXbilPc1z7fTIG4iPjtdi95bGE9n4dBX8A==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/util": "1.9.3",
-        "node-fetch": "2.6.7",
-        "tslib": "^2.1.0"
+        "@firebase/component": "0.6.5",
+        "@firebase/util": "1.9.4",
+        "tslib": "^2.1.0",
+        "undici": "5.26.5"
       },
       "dependencies": {
-        "node-fetch": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+        "undici": {
+          "version": "5.26.5",
+          "resolved": "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz",
+          "integrity": "sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==",
           "requires": {
-            "whatwg-url": "^5.0.0"
+            "@fastify/busboy": "^2.0.0"
           }
         }
       }
     },
     "@firebase/storage-compat": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.3.2.tgz",
-      "integrity": "sha512-wvsXlLa9DVOMQJckbDNhXKKxRNNewyUhhbXev3t8kSgoCotd1v3MmqhKKz93ePhDnhHnDs7bYHy+Qa8dRY6BXw==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.3.4.tgz",
+      "integrity": "sha512-Y0m5e2gS/wB9Ioth2X/Sgz76vcxvqgQrCmfa9qwhss/N31kxY2Gks6Frv0nrE18AjVfcSmcfDitqUwxcMOTRSg==",
       "requires": {
-        "@firebase/component": "0.6.4",
-        "@firebase/storage": "0.11.2",
+        "@firebase/component": "0.6.5",
+        "@firebase/storage": "0.12.1",
         "@firebase/storage-types": "0.8.0",
-        "@firebase/util": "1.9.3",
+        "@firebase/util": "1.9.4",
         "tslib": "^2.1.0"
       }
     },
@@ -21417,107 +20929,45 @@
       "requires": {}
     },
     "@firebase/util": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz",
-      "integrity": "sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==",
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.4.tgz",
+      "integrity": "sha512-WLonYmS1FGHT97TsUmRN3qnTh5TeeoJp1Gg5fithzuAgdZOUtsYECfy7/noQ3llaguios8r5BuXSEiK82+UrxQ==",
       "requires": {
         "tslib": "^2.1.0"
       }
     },
     "@firebase/webchannel-wrapper": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.0.tgz",
-      "integrity": "sha512-2I8y+vJVrPfPFJrnRGpao1Qc2Gu7wmYoo5ed2s5zK/DUGgcyY1Yr/xC0YdnKM4pi7rG3HqwW9ehAKUXoTMLdoA=="
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.5.tgz",
+      "integrity": "sha512-eSkJsnhBWv5kCTSU1tSUVl9mpFu+5NXXunZc83le8GMjMlsWwQArSc7cJJ4yl+aDFY0NGLi0AjZWMn1axOrkRg=="
     },
     "@googlemaps/markerclusterer": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@googlemaps/markerclusterer/-/markerclusterer-2.0.15.tgz",
-      "integrity": "sha512-/I6Esi5FtyeVHsezN9Kut8zRJoqe7KkTIJXGVqpKFf6BjC7qQ1xRajLMkOz0s8XKgLevbr+KdYjuvmj+LohOGg==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/@googlemaps/markerclusterer/-/markerclusterer-2.5.3.tgz",
+      "integrity": "sha512-x7lX0R5yYOoiNectr10wLgCBasNcXFHiADIBdmn7jQllF2B5ENQw5XtZK+hIw4xnV0Df0xhN4LN98XqA5jaiOw==",
       "requires": {
         "fast-deep-equal": "^3.1.3",
-        "supercluster": "^7.1.3"
+        "supercluster": "^8.0.1"
       }
     },
     "@grpc/grpc-js": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.3.tgz",
-      "integrity": "sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog==",
+      "version": "1.9.14",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.14.tgz",
+      "integrity": "sha512-nOpuzZ2G3IuMFN+UPPpKrC6NsLmWsTqSsm66IRfnBt1D4pwTqE27lmbpcPM+l2Ua4gE7PfjRHI6uedAy7hoXUw==",
       "requires": {
-        "@grpc/proto-loader": "^0.7.0",
+        "@grpc/proto-loader": "^0.7.8",
         "@types/node": ">=12.12.47"
-      },
-      "dependencies": {
-        "@grpc/proto-loader": {
-          "version": "0.7.7",
-          "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.7.tgz",
-          "integrity": "sha512-1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ==",
-          "requires": {
-            "@types/long": "^4.0.1",
-            "lodash.camelcase": "^4.3.0",
-            "long": "^4.0.0",
-            "protobufjs": "^7.0.0",
-            "yargs": "^17.7.2"
-          }
-        },
-        "protobufjs": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.3.tgz",
-          "integrity": "sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==",
-          "requires": {
-            "@protobufjs/aspromise": "^1.1.2",
-            "@protobufjs/base64": "^1.1.2",
-            "@protobufjs/codegen": "^2.0.4",
-            "@protobufjs/eventemitter": "^1.1.0",
-            "@protobufjs/fetch": "^1.1.0",
-            "@protobufjs/float": "^1.0.2",
-            "@protobufjs/inquire": "^1.1.0",
-            "@protobufjs/path": "^1.1.2",
-            "@protobufjs/pool": "^1.1.0",
-            "@protobufjs/utf8": "^1.1.0",
-            "@types/node": ">=13.7.0",
-            "long": "^5.0.0"
-          },
-          "dependencies": {
-            "long": {
-              "version": "5.2.3",
-              "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
-              "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
-            }
-          }
-        }
       }
     },
     "@grpc/proto-loader": {
-      "version": "0.6.13",
-      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.13.tgz",
-      "integrity": "sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==",
+      "version": "0.7.10",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz",
+      "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==",
       "requires": {
-        "@types/long": "^4.0.1",
         "lodash.camelcase": "^4.3.0",
-        "long": "^4.0.0",
-        "protobufjs": "^6.11.3",
-        "yargs": "^16.2.0"
-      },
-      "dependencies": {
-        "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "20.2.9",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
-        }
+        "long": "^5.0.0",
+        "protobufjs": "^7.2.4",
+        "yargs": "^17.7.2"
       }
     },
     "@isaacs/cliui": {
@@ -22773,12 +22223,12 @@
       "optional": true
     },
     "@schematics/angular": {
-      "version": "15.2.8",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.8.tgz",
-      "integrity": "sha512-F49IEzCFxQlpaMIgTO/wF1l/CLQKif7VaiDdyiTKOeT22IMmyd61FUmWDyZYfCBqMlvBmvDGx64HaHWes1HYCg==",
+      "version": "17.1.3",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.1.3.tgz",
+      "integrity": "sha512-hmeasOvzmniy6urtzUKhEqGO67iPuLX/dVtkF4nWp2NTtcEKlvcJobNDMc+CTlX4+ZMPVOvmhDMQqrlfekZ+NQ==",
       "requires": {
-        "@angular-devkit/core": "15.2.8",
-        "@angular-devkit/schematics": "15.2.8",
+        "@angular-devkit/core": "17.1.3",
+        "@angular-devkit/schematics": "17.1.3",
         "jsonc-parser": "3.2.0"
       }
     },
@@ -23083,10 +22533,15 @@
         "firebase": "*"
       }
     },
+    "@types/geojson": {
+      "version": "7946.0.14",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
+      "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg=="
+    },
     "@types/google.maps": {
-      "version": "3.53.1",
-      "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.53.1.tgz",
-      "integrity": "sha512-+7JVpq+kFzTU3TweSz6huYuFedZ4s60WeABaXYU6rDZczdpfoQ5DuZNCDc/eAAcdFJpxMMDpzf3d9YTMNodBFg=="
+      "version": "3.55.3",
+      "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.55.3.tgz",
+      "integrity": "sha512-UF1nfj8h/Vj4wEcdjv5v314HkDB6AWaN34Fr/u+6Oaj+GSRlG+k4c3DnJNKv7S23RvDdvIPt4ON6ONJpzNnarA=="
     },
     "@types/http-errors": {
       "version": "2.0.4",
@@ -23106,11 +22561,6 @@
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
       "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
     },
-    "@types/long": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
-      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
-    },
     "@types/mime": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
@@ -23214,6 +22664,14 @@
         "@types/node": "*"
       }
     },
+    "@types/supercluster": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz",
+      "integrity": "sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==",
+      "requires": {
+        "@types/geojson": "*"
+      }
+    },
     "@types/triple-beam": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz",
@@ -24232,6 +23690,8 @@
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "optional": true,
+      "peer": true,
       "requires": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -24242,6 +23702,8 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "optional": true,
+          "peer": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -24250,6 +23712,8 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "optional": true,
+          "peer": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -24257,12 +23721,16 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "optional": true,
+          "peer": true
         },
         "wrap-ansi": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
           "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+          "optional": true,
+          "peer": true,
           "requires": {
             "ansi-styles": "^4.0.0",
             "string-width": "^4.1.0",
@@ -25653,15 +25121,6 @@
         }
       }
     },
-    "file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      }
-    },
     "file-saver": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
@@ -25804,36 +25263,36 @@
       }
     },
     "firebase": {
-      "version": "9.22.0",
-      "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.22.0.tgz",
-      "integrity": "sha512-Ay1u8IOfhPh58RFAHF7A9cKHACCgV6uI2bhkzKdkjnV0n2AAxn4tDtdXvJ3BEbfhF4WWBC2dFcEXH8cd14ptaw==",
-      "requires": {
-        "@firebase/analytics": "0.10.0",
-        "@firebase/analytics-compat": "0.2.6",
-        "@firebase/app": "0.9.10",
-        "@firebase/app-check": "0.7.0",
-        "@firebase/app-check-compat": "0.3.6",
-        "@firebase/app-compat": "0.2.10",
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/firebase/-/firebase-10.8.0.tgz",
+      "integrity": "sha512-UJpC24vw8JFuHEOQyArBGKTUd7+kohLISCzHyn0M/prP0KOTx2io1eyLliEid330QqnWI7FOlPxoU97qecCSfQ==",
+      "requires": {
+        "@firebase/analytics": "0.10.1",
+        "@firebase/analytics-compat": "0.2.7",
+        "@firebase/app": "0.9.27",
+        "@firebase/app-check": "0.8.2",
+        "@firebase/app-check-compat": "0.3.9",
+        "@firebase/app-compat": "0.2.27",
         "@firebase/app-types": "0.9.0",
-        "@firebase/auth": "0.23.2",
-        "@firebase/auth-compat": "0.4.2",
-        "@firebase/database": "0.14.4",
-        "@firebase/database-compat": "0.3.4",
-        "@firebase/firestore": "3.12.0",
-        "@firebase/firestore-compat": "0.3.9",
-        "@firebase/functions": "0.9.4",
-        "@firebase/functions-compat": "0.3.4",
-        "@firebase/installations": "0.6.4",
-        "@firebase/installations-compat": "0.2.4",
-        "@firebase/messaging": "0.12.4",
-        "@firebase/messaging-compat": "0.2.4",
-        "@firebase/performance": "0.6.4",
-        "@firebase/performance-compat": "0.2.4",
-        "@firebase/remote-config": "0.4.4",
-        "@firebase/remote-config-compat": "0.2.4",
-        "@firebase/storage": "0.11.2",
-        "@firebase/storage-compat": "0.3.2",
-        "@firebase/util": "1.9.3"
+        "@firebase/auth": "1.6.0",
+        "@firebase/auth-compat": "0.5.2",
+        "@firebase/database": "1.0.3",
+        "@firebase/database-compat": "1.0.3",
+        "@firebase/firestore": "4.4.2",
+        "@firebase/firestore-compat": "0.3.25",
+        "@firebase/functions": "0.11.1",
+        "@firebase/functions-compat": "0.3.7",
+        "@firebase/installations": "0.6.5",
+        "@firebase/installations-compat": "0.2.5",
+        "@firebase/messaging": "0.12.6",
+        "@firebase/messaging-compat": "0.2.6",
+        "@firebase/performance": "0.6.5",
+        "@firebase/performance-compat": "0.2.5",
+        "@firebase/remote-config": "0.4.5",
+        "@firebase/remote-config-compat": "0.2.5",
+        "@firebase/storage": "0.12.1",
+        "@firebase/storage-compat": "0.3.4",
+        "@firebase/util": "1.9.4"
       }
     },
     "flat": {
@@ -27568,9 +27027,9 @@
       }
     },
     "kdbush": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz",
-      "integrity": "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew=="
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
+      "integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA=="
     },
     "keyv": {
       "version": "3.1.0",
@@ -27843,9 +27302,9 @@
       }
     },
     "long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
     },
     "lowercase-keys": {
       "version": "1.0.1",
@@ -27862,11 +27321,11 @@
       }
     },
     "magic-string": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz",
-      "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==",
+      "version": "0.30.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
       "requires": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       }
     },
     "make-dir": {
@@ -28345,14 +27804,6 @@
         "tslib": "^2.3.1"
       }
     },
-    "ngx-auth-firebaseui": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/ngx-auth-firebaseui/-/ngx-auth-firebaseui-7.1.0.tgz",
-      "integrity": "sha512-fHwVhdBkvxsNWpN4zKwcqq82WsdEB5xXNxNVhvayajK1OdaEK6LaCLZFycIhS/mfy5X3ufN1rIf4ctX2QK846w==",
-      "requires": {
-        "tslib": "^2.0.0"
-      }
-    },
     "ngx-filesaver": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/ngx-filesaver/-/ngx-filesaver-14.0.0.tgz",
@@ -29244,9 +28695,9 @@
       }
     },
     "protobufjs": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
-      "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==",
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.6.tgz",
+      "integrity": "sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==",
       "requires": {
         "@protobufjs/aspromise": "^1.1.2",
         "@protobufjs/base64": "^1.1.2",
@@ -29258,9 +28709,8 @@
         "@protobufjs/path": "^1.1.2",
         "@protobufjs/pool": "^1.1.0",
         "@protobufjs/utf8": "^1.1.0",
-        "@types/long": "^4.0.1",
         "@types/node": ">=13.7.0",
-        "long": "^4.0.0"
+        "long": "^5.0.0"
       }
     },
     "protractor": {
@@ -30049,19 +29499,10 @@
       }
     },
     "rxfire": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/rxfire/-/rxfire-6.0.3.tgz",
-      "integrity": "sha512-77nkyffHh7jgfi1YA/N9RI+kWxYpgKk6GRML1lyersvaqbJt4hkvWwk1rWib9Rb5Lr5mT+Ha45lu7nM79sJCZA==",
-      "requires": {
-        "tslib": "^1.9.0 || ~2.1.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-          "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
-        }
-      }
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/rxfire/-/rxfire-6.0.5.tgz",
+      "integrity": "sha512-ycBsANGbya3GNtOBKzZVATLEV+0S9gUrlTfwnN15TCXtgG8OgIMAuv2k9+kMeVaevp/DRp1KT+vYf6Wkop6gvw==",
+      "requires": {}
     },
     "rxjs": {
       "version": "7.8.1",
@@ -30925,11 +30366,11 @@
       "dev": true
     },
     "supercluster": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz",
-      "integrity": "sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz",
+      "integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==",
       "requires": {
-        "kdbush": "^3.0.0"
+        "kdbush": "^4.0.2"
       }
     },
     "supports-color": {
diff --git a/bcp/package.json b/bcp/package.json
index d79238b..47ffbbf 100644
--- a/bcp/package.json
+++ b/bcp/package.json
@@ -35,16 +35,17 @@
     "@angular/common": "17",
     "@angular/compiler": "17",
     "@angular/core": "17",
-    "@angular/fire": "*",
+    "@angular/fire": "17",
     "@angular/flex-layout": "15.0.0-beta.42",
     "@angular/forms": "17",
-    "@angular/google-maps": "16",
+    "@angular/google-maps": "17.1.2",
     "@angular/material": "17",
     "@angular/platform-browser": "17",
     "@angular/platform-browser-dynamic": "17",
     "@angular/router": "17",
     "@googlemaps/markerclusterer": "*",
     "@types/firebase": "*",
+    "@types/supercluster": "^7.1.3",
     "firebase": "*",
     "ng-gallery": "8",
     "ngx-lightbox": "*",
@@ -77,4 +78,4 @@
     "workbox-cli": "*",
     "workbox-sw": "*"
   }
-}
\ No newline at end of file
+}
diff --git a/bcp/src/app/app.module.ts b/bcp/src/app/app.module.ts
index c30ecc0..b13cc67 100644
--- a/bcp/src/app/app.module.ts
+++ b/bcp/src/app/app.module.ts
@@ -2,13 +2,13 @@ import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { FormsModule } from '@angular/forms';
+import { HttpClientModule } from '@angular/common/http';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FlexLayoutModule } from "@angular/flex-layout";
 import { GoogleMapsModule } from '@angular/google-maps';
-import { NgxAuthFirebaseUIModule } from 'ngx-auth-firebaseui';
 import { environment } from '../environments/environment';
 import { GalleryModule } from 'ng-gallery';
 import { StorageModule } from '@angular/fire/storage';
@@ -60,7 +60,10 @@ import { BcpSiteDetailComponent } from './bcp-site-detail/bcp-site-detail.compon
 import { BcpSiteSelectorComponent } from './bcp-site-selector/bcp-site-selector.component';
 import { BcpListInputComponent, UrlProcessPipe } from './bcp-list-input/bcp-list-input.component';
 import { TruncatePipe } from './bcp-truncate-pipe';
-import { CookieDialog } from './app.component'
+import { CookieDialog } from './app.component';
+import { provideFirebaseApp, initializeApp } from '@angular/fire/app';
+import { provideAuth, getAuth } from '@angular/fire/auth';
+import { MapMarkerClusterer} from './google-maps-clusterer/map-marker-clusterer';
 
 @NgModule({
   declarations: [
@@ -89,9 +92,11 @@ import { CookieDialog } from './app.component'
     UrlProcessPipe,
     TruncatePipe,
     CookieDialog,
+    MapMarkerClusterer,
   ],
   imports: [
     BrowserModule,
+    HttpClientModule,
     AppRoutingModule,
     BrowserAnimationsModule,
     MatToolbarModule,
@@ -114,7 +119,8 @@ import { CookieDialog } from './app.component'
     MatChipsModule,
     BrowserModule,
     MatStepperModule,
-    NgxAuthFirebaseUIModule.forRoot(environment.firebaseui),
+    provideFirebaseApp(() => initializeApp(environment.firebase)),
+    provideAuth(() => getAuth()),
     MatGridListModule,
     MatRadioModule,
     GalleryModule,
diff --git a/bcp/src/app/bcp-database/bcp-database.component.html b/bcp/src/app/bcp-database/bcp-database.component.html
index 5eff5d8..d3bc9f5 100644
--- a/bcp/src/app/bcp-database/bcp-database.component.html
+++ b/bcp/src/app/bcp-database/bcp-database.component.html
@@ -7,14 +7,26 @@
             (zoomChanged)="onBoundsChanged()"
             (mapDragend)="onBoundsChanged()"
 >
-<map-info-window><app-bcp-data-card *ngIf="selectedMarker[0]" [routerLink]="['entry']" [queryParams]="{gunid:selectedMarker[0].gunid}"
-    [record]="selectedMarker[0]" 
-></app-bcp-data-card></map-info-window>
-<map-marker-clusterer>
-    @for (position of markerPositions; track position) {
-        <map-marker [position]="position" />
-    }
-</map-marker-clusterer>
+    <map-info-window>
+        <app-bcp-data-card *ngIf="selectedMarker" 
+            [routerLink]="['entry']"
+            [queryParams]="{gunid:selectedMarker.gunid}"
+            [record]="selectedMarker" 
+        ></app-bcp-data-card>
+    </map-info-window>
+    <new-map-marker-clusterer
+        [options]="clusterOptions"
+        [apiInitialized]="apiLoaded"
+    >
+        @for (marker of markerPositions; track marker) {
+            <map-marker 
+                [position]="marker.position" 
+                [icon]="marker.icon" 
+                [clickable]="true"
+                (mapClick)="markerClick($event)"
+            />
+        }
+    </new-map-marker-clusterer>
 </google-map>
 <div #bounding_box class="bounding-box" fxHide fxShow.gt-sm></div>
 </div>
diff --git a/bcp/src/app/bcp-database/bcp-database.component.ts b/bcp/src/app/bcp-database/bcp-database.component.ts
index 9cd56f2..e3c5abf 100644
--- a/bcp/src/app/bcp-database/bcp-database.component.ts
+++ b/bcp/src/app/bcp-database/bcp-database.component.ts
@@ -1,3 +1,4 @@
+///<reference types='google.maps' />
 ///<reference path='../googlemap-locate/google-locate-control.ts' />
 import { Component, ViewChild, OnInit, AfterViewInit, OnDestroy, ElementRef, ChangeDetectorRef} from '@angular/core';
 import { MapInfoWindow, MapMarker } from '@angular/google-maps';
@@ -6,9 +7,14 @@ import { BcpMapDataService, DataItem } from '../bcp-map-data.service';
 import { BcpSiteDataService } from '../bcp-site-data.service';
 import { MatSlideToggleChange } from '@angular/material/slide-toggle';
 import { LocateControlOptions } from '../googlemap-locate/google-locate-control';
-import { MarkerClustererOptions, MarkerClusterer, SuperClusterAlgorithm } from '@googlemaps/markerclusterer';
+import { SuperClusterAlgorithm, MarkerClustererOptions } from '@googlemaps/markerclusterer';
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
-import { Subscription } from 'rxjs';
+import { Subscription, Subject } from 'rxjs';
+
+export interface MarkerData {
+  position: google.maps.LatLng;
+  icon: google.maps.Icon
+}
 
 
 @Component({
@@ -20,10 +26,10 @@ export class BcpDatabaseComponent implements OnInit, AfterViewInit, OnDestroy {
   options: google.maps.MapOptions = {
     zoom: 2.5,
     center: {lat: 50, lng: 80},
-    mapTypeId: google.maps.MapTypeId.ROADMAP,
+    mapTypeId: 'roadmap',
     zoomControl: true,
     zoomControlOptions:{
-        position: google.maps.ControlPosition.LEFT_BOTTOM},
+        position: 3.0},
     mapTypeControl: false,
     scaleControl: true,
     streetViewControl: false,
@@ -31,7 +37,7 @@ export class BcpDatabaseComponent implements OnInit, AfterViewInit, OnDestroy {
     fullscreenControl: false,
   } 
   locateOptions: LocateControlOptions= {
-    position: google.maps.ControlPosition.LEFT_BOTTOM,
+    position: 3.0,
     pan: true,
     zoom: true,
     zoomTo: 17
@@ -39,12 +45,7 @@ export class BcpDatabaseComponent implements OnInit, AfterViewInit, OnDestroy {
   clusterOptions: MarkerClustererOptions = {
     algorithm: new SuperClusterAlgorithm({
       maxZoom: 12
-    }),
-    markers: [ new google.maps.Marker(
-      {icon:{
-        url:'../assets/m'
-      }}
-    )]
+    })
   }
   invisMarker: google.maps.MarkerOptions = {visible: false, opacity: 0};
   subscriptions: Subscription[] = [];
@@ -53,10 +54,11 @@ export class BcpDatabaseComponent implements OnInit, AfterViewInit, OnDestroy {
   @ViewChild(MapInfoWindow, {static: false}) mapInfo: MapInfoWindow;
   @ViewChild(MapMarker, {static: false}) mapMarker: MapMarker;
   @ViewChild("bounding_box", {static: false}) boundingBoxElement: ElementRef;
-  mc: MarkerClusterer;
 
+  markerPositions: MarkerData[] = [];
+  selectedMarker: DataItem;
 
-  selectedMarker: DataItem[];
+  apiLoaded = new Subject<void>();
 
   constructor(public FILTER_TEXT: BcpFilterValuesService, 
               public data: BcpMapDataService, 
@@ -77,14 +79,12 @@ export class BcpDatabaseComponent implements OnInit, AfterViewInit, OnDestroy {
     }));
     this.subscriptions.push(this.data.$clearMarkers.subscribe({
       next: () => {
-        this.mc = null;
         this.loadMarkers();
       }
     }));
     this.subscriptions.push(this.sites.$newData.subscribe({
       next: () => this.updateSites(),
     }));
-    this.selectedMarker=[];
     const screenWidth: number = window.innerWidth;
     if (screenWidth < 600) {
       this.options.center = {lat: 30, lng: 20};
@@ -97,6 +97,7 @@ export class BcpDatabaseComponent implements OnInit, AfterViewInit, OnDestroy {
 
   loaded($event) {
     let map = $event;
+    this.apiLoaded.next();
     google.maps.event.addListenerOnce($event, "idle", () =>{
       this.map = map;
       if (this.data.nativeBounds) {
@@ -154,38 +155,40 @@ export class BcpDatabaseComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   onBoundsChanged(): void {
-    let proj = this.map.getProjection();
-    let bounds = this.map.getBounds();
-    this.data.nativeBounds = bounds;
-    let ne = bounds.getNorthEast();
-    let sw = bounds.getSouthWest();
-    // if zoomed too close - the calculation will fail because the bounds are limited to +-180. +-90
-    let oob = Math.abs(ne.lat()) == 90 ||
-              Math.abs(ne.lng()) == 180 ||
-              Math.abs(sw.lat()) == 90 ||
-              Math.abs(sw.lng()) == 180;
-    // if out of bounds or on a small screen - the map is the bounding box
-    if (oob || this.breakpointObserver.isMatched([Breakpoints.XSmall, Breakpoints.Small])) {
-      this.data.boundingBox = bounds;
-      this.sites.boundingBox = bounds;
-    // otherwise - the dotted line box is the bounding box
-    } else {
-
-      let bottomLeft = proj.fromLatLngToPoint(sw);
-      let topRight = proj.fromLatLngToPoint(ne);
-      let scale = 1 << this.map.getZoom();
-      let boundingBox = new google.maps.LatLngBounds(
-        proj.fromPointToLatLng( new google.maps.Point(
-          10/scale + bottomLeft.x,
-          (this.boundingBoxElement.nativeElement.offsetHeight + 73 )/scale + topRight.y
-        )),
-        proj.fromPointToLatLng ( new google.maps.Point( 
-          (this.boundingBoxElement.nativeElement.offsetWidth + 10)/ scale + bottomLeft.x,
-          73/scale + topRight.y
-        ))
-      );
-      this.data.boundingBox = boundingBox;
-      this.sites.boundingBox = boundingBox;
+    if (this.map){
+      let proj = this.map.getProjection();
+      let bounds = this.map.getBounds();
+      this.data.nativeBounds = bounds;
+      let ne = bounds.getNorthEast();
+      let sw = bounds.getSouthWest();
+      // if zoomed too close - the calculation will fail because the bounds are limited to +-180. +-90
+      let oob = Math.abs(ne.lat()) == 90 ||
+                Math.abs(ne.lng()) == 180 ||
+                Math.abs(sw.lat()) == 90 ||
+                Math.abs(sw.lng()) == 180;
+      // if out of bounds or on a small screen - the map is the bounding box
+      if (oob || this.breakpointObserver.isMatched([Breakpoints.XSmall, Breakpoints.Small])) {
+        this.data.boundingBox = bounds;
+        this.sites.boundingBox = bounds;
+      // otherwise - the dotted line box is the bounding box
+      } else {
+
+        let bottomLeft = proj.fromLatLngToPoint(sw);
+        let topRight = proj.fromLatLngToPoint(ne);
+        let scale = 1 << this.map.getZoom();
+        let boundingBox = new google.maps.LatLngBounds(
+          proj.fromPointToLatLng( new google.maps.Point(
+            10/scale + bottomLeft.x,
+            (this.boundingBoxElement.nativeElement.offsetHeight + 73 )/scale + topRight.y
+          )),
+          proj.fromPointToLatLng ( new google.maps.Point( 
+            (this.boundingBoxElement.nativeElement.offsetWidth + 10)/ scale + bottomLeft.x,
+            73/scale + topRight.y
+          ))
+        );
+        this.data.boundingBox = boundingBox;
+        this.sites.boundingBox = boundingBox;
+      }
     }
   }
 
@@ -195,52 +198,21 @@ export class BcpDatabaseComponent implements OnInit, AfterViewInit, OnDestroy {
 
   public loadMarkers( ): void {
     this.changeDet.reattach();
-    /* if(! this.mc){
-      this.clusterOptions.map = this.map;
-      this.mc = new MarkerClusterer(this.clusterOptions );
-      this.mc.clearMarkers();
-      let markers: Marker[] = [];
-      if ( this.data.filteredData && this.data.filteredData.length > 0) { 
-        for (let entry of this.data.filteredData) {
-          if (entry.marker) {
-            markers.push(entry.marker);
-          }
-        }
-        this.mc.addMarkers(markers);
-      }
-    } else {
-      if ( this.data.filteredData && this.data.filteredData.length > 0) {
-        let mapInfo = this.mapInfo;
-        let mapMarker = this.mapMarker;
-        let data = this.data;
-        let selectedMarker = this.selectedMarker;
-        let markers: Marker[] = [];
-        // var entry: DataItem;
-        for (let entry of this.data.filteredData) {
-          if (! entry.marker){
-            let options: google.maps.MarkerOptions = {
-              draggable: false,
-            }
-            let icon: google.maps.Icon = {'url':''};
-            if (entry.quality == this.FILTER_TEXT.RECORD_QUALITIES[1]) icon.url = '../assets/cannon_bronze.png';
-            else if (entry.quality == this.FILTER_TEXT.RECORD_QUALITIES[2]) icon.url = '../assets/cannon_silver.png';
-            else if (entry.quality == this.FILTER_TEXT.RECORD_QUALITIES[3]) icon.url = '../assets/cannon_gold.png';
-            let marker=new Marker(options);
-            marker.setPosition(entry.location);
-            marker.setIcon(icon);
-            marker.addListener('click', function (e) {
-              selectedMarker[0] = data.filteredData.find(item => item.location == this.getPosition())
-              mapMarker.marker = this;
-              mapInfo.open(mapMarker);
-            });
-            markers.push(marker)
-            entry.marker = marker;
-          } else {
-
-          };
-        }
-        this.mc.addMarkers(markers);
+    if ( this.data.filteredData && this.data.filteredData.length > 0) { 
+      for (let entry of this.data.filteredData) {
+        let icon: google.maps.Icon = {'url':''};
+        if (entry.quality == this.FILTER_TEXT.RECORD_QUALITIES[1]) icon.url = '../assets/cannon_bronze.png';
+        else if (entry.quality == this.FILTER_TEXT.RECORD_QUALITIES[2]) icon.url = '../assets/cannon_silver.png';
+        else if (entry.quality == this.FILTER_TEXT.RECORD_QUALITIES[3]) icon.url = '../assets/cannon_gold.png';
+        let md = {position: entry.location, icon:icon}
+        if ( ! this.markerPositions.find( item => item.position == md.position)) this.markerPositions.push(md)
       }
-    } */
+    }
+  }
+
+  public markerClick($event) {
+    this.selectedMarker = this.data.filteredData.find(item => item.location == $event.latLng)
+    this.mapMarker.marker = $event;
+    this.mapInfo.open(this.mapMarker);
   }
 }
diff --git a/bcp/src/app/bcp-gmap/bcp-gmap.component.html b/bcp/src/app/bcp-gmap/bcp-gmap.component.html
index aff4f14..a0ff284 100644
--- a/bcp/src/app/bcp-gmap/bcp-gmap.component.html
+++ b/bcp/src/app/bcp-gmap/bcp-gmap.component.html
@@ -7,6 +7,11 @@
                         (tilesloaded)="loaded($event)"
                         (boundsChanged)="newBounds$.next($event)"
             >
+                <map-marker 
+                    [position]="marker" 
+                    [options]="markerOptions"
+                    (dragend)="this.markerDragged($event)"
+                />
             </google-map>
         </div>
     </mat-card-content>
diff --git a/bcp/src/app/bcp-gmap/bcp-gmap.component.ts b/bcp/src/app/bcp-gmap/bcp-gmap.component.ts
index 3c75689..2bfa476 100644
--- a/bcp/src/app/bcp-gmap/bcp-gmap.component.ts
+++ b/bcp/src/app/bcp-gmap/bcp-gmap.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild, Input, Output, EventEmitter } from '@angular/core';
 import { BcpFilterValuesService } from '../bcp-filter-values.service';
 import { GoogleMap } from '@angular/google-maps';
-import { DataItem, Marker } from '../bcp-map-data.service';
+import { DataItem } from '../bcp-map-data.service';
 
 
 
@@ -13,10 +13,15 @@ import { DataItem, Marker } from '../bcp-map-data.service';
 export class BcpGmapComponent implements OnInit {
 
 
-  private map: google.maps.Map;
+  map: google.maps.Map;
   @ViewChild(GoogleMap, {static: false}) my_map: GoogleMap;
 
-  private marker: Marker
+  marker: google.maps.LatLng;
+  markerOptions: google.maps.MarkerOptions = {
+    draggable: true,
+  };
+  markerIcon: google.maps.Icon = {'url':''};
+
 
   private _loc: google.maps.LatLng
   
@@ -86,21 +91,10 @@ export class BcpGmapComponent implements OnInit {
       this.map.setCenter(this.location);
       this.map.setZoom(1);
     }
-    let options: google.maps.MarkerOptions = {
-      draggable: true,
-    }
-    if (! this.marker) {
-      let icon: google.maps.Icon = {'url':''};
-      if (this.quality == this.DATA_VALUES.RECORD_QUALITIES[1]) icon.url = '../assets/cannon_bronze.png';
-      else if (this.quality == this.DATA_VALUES.RECORD_QUALITIES[2]) icon.url = '../assets/cannon_silver.png';
-      else if (this.quality == this.DATA_VALUES.RECORD_QUALITIES[3]) icon.url = '../assets/cannon_gold.png';
-      this.marker=new Marker(options);
-      this.marker.setPosition(this.location);
-      this.marker.setIcon(icon);
-      this.marker.setMap(this.map);
-      this.marker.addListener("dragend", event => this.markerDragged(event));
-    }
-
+    if (this.quality == this.DATA_VALUES.RECORD_QUALITIES[1]) this.markerIcon.url = '../assets/cannon_bronze.png';
+    else if (this.quality == this.DATA_VALUES.RECORD_QUALITIES[2]) this.markerIcon.url = '../assets/cannon_silver.png';
+    else if (this.quality == this.DATA_VALUES.RECORD_QUALITIES[3]) this.markerIcon.url = '../assets/cannon_gold.png';
+    this.marker = this.location;
   }
 
   markerDragged(event){
@@ -120,7 +114,7 @@ export class BcpGmapComponent implements OnInit {
   private showPosition(position: GeolocationPosition) {
     this.location = new google.maps.LatLng(position.coords.latitude,position.coords.longitude );
     this.map.setCenter(this.location);
-    this.marker.setPosition(this.location);
+    this.marker = this.location;
     this.newLocation$.next(this.location);
   }
 
@@ -144,7 +138,7 @@ export class BcpGmapComponent implements OnInit {
   set() {
     this.location = new google.maps.LatLng(parseFloat(this.displayLoc.lat), parseFloat(this.displayLoc.lng));
     this.map.setCenter(this.location);
-    this.marker.setPosition(this.location);
+    this.marker = this.location;
     this.newLocation$.next(this.location);
   }
 }
diff --git a/bcp/src/app/bcp-login/bcp-login.component.css b/bcp/src/app/bcp-login/bcp-login.component.css
index e69de29..8fd384f 100644
--- a/bcp/src/app/bcp-login/bcp-login.component.css
+++ b/bcp/src/app/bcp-login/bcp-login.component.css
@@ -0,0 +1,108 @@
+.gsi-material-button {
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    -webkit-appearance: none;
+    background-color: WHITE;
+    background-image: none;
+    border: 1px solid #747775;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    color: #1f1f1f;
+    cursor: pointer;
+    font-family: 'Roboto', arial, sans-serif;
+    font-size: 14px;
+    height: 40px;
+    letter-spacing: 0.25px;
+    outline: none;
+    overflow: hidden;
+    padding: 0 12px;
+    position: relative;
+    text-align: center;
+    -webkit-transition: background-color .218s, border-color .218s, box-shadow .218s;
+    transition: background-color .218s, border-color .218s, box-shadow .218s;
+    vertical-align: middle;
+    white-space: nowrap;
+    width: auto;
+    max-width: 400px;
+    min-width: min-content;
+  }
+  
+  .gsi-material-button .gsi-material-button-icon {
+    height: 20px;
+    margin-right: 12px;
+    min-width: 20px;
+    width: 20px;
+  }
+  
+  .gsi-material-button .gsi-material-button-content-wrapper {
+    -webkit-align-items: center;
+    align-items: center;
+    display: flex;
+    -webkit-flex-direction: row;
+    flex-direction: row;
+    -webkit-flex-wrap: nowrap;
+    flex-wrap: nowrap;
+    height: 100%;
+    justify-content: space-between;
+    position: relative;
+    width: 100%;
+  }
+  
+  .gsi-material-button .gsi-material-button-contents {
+    -webkit-flex-grow: 1;
+    flex-grow: 1;
+    font-family: 'Roboto', arial, sans-serif;
+    font-weight: 500;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: top;
+  }
+  
+  .gsi-material-button .gsi-material-button-state {
+    -webkit-transition: opacity .218s;
+    transition: opacity .218s;
+    bottom: 0;
+    left: 0;
+    opacity: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+  
+  .gsi-material-button:disabled {
+    cursor: default;
+    background-color: #ffffff61;
+    border-color: #1f1f1f1f;
+  }
+  
+  .gsi-material-button:disabled .gsi-material-button-contents {
+    opacity: 38%;
+  }
+  
+  .gsi-material-button:disabled .gsi-material-button-icon {
+    opacity: 38%;
+  }
+  
+  .gsi-material-button:not(:disabled):active .gsi-material-button-state, 
+  .gsi-material-button:not(:disabled):focus .gsi-material-button-state {
+    background-color: #303030;
+    opacity: 12%;
+  }
+  
+  .gsi-material-button:not(:disabled):hover {
+    -webkit-box-shadow: 0 1px 2px 0 rgba(60, 64, 67, .30), 0 1px 3px 1px rgba(60, 64, 67, .15);
+    box-shadow: 0 1px 2px 0 rgba(60, 64, 67, .30), 0 1px 3px 1px rgba(60, 64, 67, .15);
+  }
+  
+  .gsi-material-button:not(:disabled):hover .gsi-material-button-state {
+    background-color: #303030;
+    opacity: 8%;
+  }
+
+  .w-100 {
+    width: 100%
+  }
+  
\ No newline at end of file
diff --git a/bcp/src/app/bcp-login/bcp-login.component.html b/bcp/src/app/bcp-login/bcp-login.component.html
index 94d41a4..25c005e 100644
--- a/bcp/src/app/bcp-login/bcp-login.component.html
+++ b/bcp/src/app/bcp-login/bcp-login.component.html
@@ -1,3 +1,109 @@
-<ngx-auth-firebaseui (onSuccess)="success($event)"
-                     (onError)="error($event)">
-</ngx-auth-firebaseui>
+@if (loggedOut) {
+    <mat-card>
+        <mat-card-header>
+            <mat-card-title>
+            </mat-card-title>
+        </mat-card-header>
+        <mat-card-actions align="end">
+            <button class="gsi-material-button" (click)="loginGoogle()">
+                <div class="gsi-material-button-state">
+                </div>
+                <div class="gsi-material-button-content-wrapper">
+                    <div class="gsi-material-button-icon">
+                        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" xmlns:xlink="http://www.w3.org/1999/xlink" style="display: block;">
+                            <path fill="#EA4335" d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"></path>
+                            <path fill="#4285F4" d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"></path>
+                            <path fill="#FBBC05" d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"></path>
+                            <path fill="#34A853" d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"></path>
+                            <path fill="none" d="M0 0h48v48H0z"></path>
+                        </svg>
+                    </div>
+                    <span class="gsi-material-button-contents">Sign in with Google</span>
+                    <span style="display: none;">Sign in with Google</span>
+                </div>
+            </button>
+        </mat-card-actions>
+    </mat-card>
+    <mat-divider></mat-divider>
+    <mat-card>
+        <mat-card-header>
+            <mat-card-title>
+            </mat-card-title>
+        </mat-card-header>
+        <mat-card-content>
+            <p>
+                @if (error) {Login Failed!}
+            </p>
+            <p>
+                <mat-form-field>
+                    <mat-label>Email</mat-label>
+                    <input matInput type="text" [(ngModel)]="email">
+                    @if (email) {
+                        <mat-icon matSuffix (click)="email=''">close</mat-icon>
+                    }
+                </mat-form-field>
+            </p>
+            <p>
+                <mat-form-field>
+                    <mat-label>Password</mat-label>
+                    <input matInput [type]="hide ? 'password' : 'text'" [(ngModel)]="password">
+                    <mat-icon matSuffix (click)="hide = !hide">{{hide ? 'visibility_off' : 'visibility'}}</mat-icon>
+                </mat-form-field>
+            </p>
+        </mat-card-content>
+        <mat-card-actions align="end">
+            <button class="gsi-material-button" (click)="register()">
+                <div class="gsi-material-button-state">
+                </div>
+                <div class="gsi-material-button-content-wrapper">
+                    <div class="gsi-material-button-icon">
+                        <i class="material-icons" >
+                            how_to_reg
+                        </i>
+                    </div>
+                    <span class="gsi-material-button-contents">Register</span>
+                    <span style="display: none;">Register</span>
+                </div>
+            </button>
+            <button class="gsi-material-button" (click)="loginEmail()">
+                <div class="gsi-material-button-state">
+                </div>
+                <div class="gsi-material-button-content-wrapper">
+                    <div class="gsi-material-button-icon">
+                        <i class="material-icons" >
+                            email
+                        </i>
+                    </div>
+                    <span class="gsi-material-button-contents">Sign in with Email</span>
+                    <span style="display: none;">Sign in with Email</span>
+                </div>
+            </button>
+        </mat-card-actions>
+    </mat-card>
+} @else {
+    <mat-card>
+        <mat-card-header>
+            <mat-card-title>
+                Logged In
+            </mat-card-title>
+            <mat-card-subtitle>
+                {{displayName}}
+            </mat-card-subtitle>
+        </mat-card-header>
+        <mat-card-actions align="end">
+            <button class="gsi-material-button" (click)="logout()">
+                <div class="gsi-material-button-state">
+                </div>
+                <div class="gsi-material-button-content-wrapper">
+                    <div class="gsi-material-button-icon">
+                        <i class="material-icons" >
+                            logout
+                        </i>
+                    </div>
+                    <span class="gsi-material-button-contents">Logout</span>
+                    <span style="display: none;">Logout</span>
+                </div>
+            </button>
+        </mat-card-actions>
+    </mat-card>
+}
diff --git a/bcp/src/app/bcp-login/bcp-login.component.ts b/bcp/src/app/bcp-login/bcp-login.component.ts
index fbe55c1..848ac56 100644
--- a/bcp/src/app/bcp-login/bcp-login.component.ts
+++ b/bcp/src/app/bcp-login/bcp-login.component.ts
@@ -1,24 +1,90 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy, Optional } from '@angular/core';
+import { Auth,
+  authState,
+  signOut,
+  User,
+  GoogleAuthProvider,
+  signInWithPopup,
+  signInWithEmailAndPassword,
+  createUserWithEmailAndPassword,
+  sendEmailVerification
+} from '@angular/fire/auth';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-bcp-login',
   templateUrl: './bcp-login.component.html',
   styleUrls: ['./bcp-login.component.css']
 })
-export class BcpLoginComponent implements OnInit {
+export class BcpLoginComponent implements OnInit, OnDestroy {
 
-  constructor() { }
+  currentUser: User | undefined;
+  displayName: string = "";
+  email: string | undefined;
+  password: string | undefined;
+  error: boolean = false;
+  hide: boolean = true;
+
+  loggedOut: boolean = true;
+  private subscriptions: Subscription[] = [];
+
+  constructor(    
+    @Optional() private auth: Auth,
+    ) {
+    if (auth) {
+      this.subscriptions.push(authState(this.auth).subscribe(user => {
+        if (user) {
+          this.loggedOut = false;
+          this.currentUser = user;
+          this.displayName = user.providerData[0].displayName ?
+                                user.providerData[0].displayName :
+                                user.providerData[0].email
+                              ? user.providerData[0].email : "";
+
+        } else {
+          this.currentUser = undefined;
+          this.displayName = "";
+          this.loggedOut = true;
+        }
+      }));
+    }
+  }
 
   ngOnInit(): void {
   }
 
-  success(event) {
-    console.log('success');
-    console.log(event);
+  ngOnDestroy(): void {
+    this.subscriptions.forEach( sub => sub.unsubscribe());
+  }
+
+  async loginGoogle() {
+    await signInWithPopup(this.auth, new GoogleAuthProvider());
+  }
+
+  async loginEmail() {
+    if ( this.email == undefined || this.password == undefined) return;
+    try {
+      this.error = false;
+      await signInWithEmailAndPassword(this.auth, this.email, this.password);
+    } catch (e) {
+      this.error = true;
+    }
+  }
+
+  async logout() {
+    await signOut(this.auth);
   }
 
-  error(event) {
-    console.log('error');
-    console.error(event);
+  async register() {
+    if ( this.email == undefined ||
+         this.password == undefined ||
+         this.auth == undefined) return;
+    try {
+      this.error = false;
+      await createUserWithEmailAndPassword(this.auth, this.email, this.password);
+      if ( this.auth.currentUser ) await sendEmailVerification(this.auth.currentUser)
+    } catch (e) {
+      this.error = true
+    }
   }
 }
diff --git a/bcp/src/app/bcp-site-detail/bcp-site-detail.component.html b/bcp/src/app/bcp-site-detail/bcp-site-detail.component.html
index 19b2f2d..5bb4bee 100644
--- a/bcp/src/app/bcp-site-detail/bcp-site-detail.component.html
+++ b/bcp/src/app/bcp-site-detail/bcp-site-detail.component.html
@@ -94,6 +94,9 @@
                                     [options]="options"
                                     (mapInitialized)="loaded($event)"
                         >
+                            @for (position of markerPositions; track position) {
+                                <map-marker [position]="position" [options]="markerOptions" />
+                            }
                         </google-map>
 
                     </div>
diff --git a/bcp/src/app/bcp-site-detail/bcp-site-detail.component.ts b/bcp/src/app/bcp-site-detail/bcp-site-detail.component.ts
index a185256..6c8dad3 100644
--- a/bcp/src/app/bcp-site-detail/bcp-site-detail.component.ts
+++ b/bcp/src/app/bcp-site-detail/bcp-site-detail.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy, ChangeDetectorRef} from '@angular/core';
 import { ActivatedRoute, ParamMap } from '@angular/router';
 import { BcpSiteDataService, Site, MapSites } from '../bcp-site-data.service';
-import { BcpMapDataService, DataItem, Marker } from '../bcp-map-data.service';
+import { BcpMapDataService, DataItem } from '../bcp-map-data.service';
 import { BcpUserService } from '../bcp-user.service';
 import { BcpApiService } from '../bcp-api.service';
 import { Router } from '@angular/router';
@@ -26,7 +26,13 @@ export class BcpSiteDetailComponent implements OnInit, OnDestroy {
   fabIcon: string = "add";
   fabTooltip: string = "Add a new Gun to this Site"
   guns: DataItem[] = [];
-  marker: Marker;
+  markerPositions: google.maps.LatLng[] = [];
+
+  markerOptions: google.maps.MarkerOptions = {
+    draggable: false,
+  };
+
+  icon: google.maps.Icon = {'url':''};
 
   options = {
     zoom: 12,
@@ -80,19 +86,12 @@ export class BcpSiteDetailComponent implements OnInit, OnDestroy {
   loaded(map: google.maps.Map): void {
     if (map) this.map = map;
     this.map.fitBounds(this.site.geocode.geometry.viewport,0);
-    let options: google.maps.MarkerOptions = {
-      draggable: false,
-    }
-    let icon: google.maps.Icon = {'url':''};
+    
     for (let gun of this.guns) {
-      if (gun.quality == this.DATA_VALUES.RECORD_QUALITIES[1]) icon.url = '../assets/cannon_bronze.png';
-      else if (gun.quality == this.DATA_VALUES.RECORD_QUALITIES[2]) icon.url = '../assets/cannon_silver.png';
-      else if (gun.quality == this.DATA_VALUES.RECORD_QUALITIES[3]) icon.url = '../assets/cannon_gold.png';
-      if (this.marker) this.marker.setVisible(false);
-      this.marker=new Marker(options);
-      this.marker.setPosition(gun.location);
-      this.marker.setIcon(icon);
-      this.marker.setMap(this.map);
+      if (gun.quality == this.DATA_VALUES.RECORD_QUALITIES[1]) this.icon.url = '../assets/cannon_bronze.png';
+      else if (gun.quality == this.DATA_VALUES.RECORD_QUALITIES[2]) this.icon.url = '../assets/cannon_silver.png';
+      else if (gun.quality == this.DATA_VALUES.RECORD_QUALITIES[3]) this.icon.url = '../assets/cannon_gold.png';
+      this.markerPositions.push(gun.location);
     }
 
   }
diff --git a/bcp/src/app/bcp-user.service.ts b/bcp/src/app/bcp-user.service.ts
index 947ef2c..869930c 100644
--- a/bcp/src/app/bcp-user.service.ts
+++ b/bcp/src/app/bcp-user.service.ts
@@ -1,8 +1,7 @@
-import { Injectable, OnDestroy } from '@angular/core';
-import {BcpApiService} from './bcp-api.service';
-import {Subscription, BehaviorSubject} from 'rxjs';
-import {AuthProcessService} from 'ngx-auth-firebaseui';
-import { User }  from 'firebase/auth';
+import { Injectable, OnDestroy, Optional } from '@angular/core';
+import { BcpApiService } from './bcp-api.service';
+import { Subscription, BehaviorSubject } from 'rxjs';
+import { User, Auth, authState }  from '@angular/fire/auth';
 
 @Injectable({
   providedIn: 'root'
@@ -17,10 +16,12 @@ export class BcpUserService implements OnDestroy {
 
   private subscriptions: Subscription[] = [];
 
-  constructor(private auth: AuthProcessService, private api: BcpApiService) {
-    this.subscriptions.push(auth.user$.subscribe( u => {
-      if (u) {
-          this.getUser(u);
+  constructor(    
+    @Optional() private auth: Auth,
+    private api: BcpApiService) {
+    this.subscriptions.push(authState(this.auth).subscribe(user => {
+      if (user)  {
+          this.getUser(user);
       } else {
         this.user.next(null);
         this.login = false;
diff --git a/bcp/src/app/google-maps-clusterer/map-marker-clusterer.ts b/bcp/src/app/google-maps-clusterer/map-marker-clusterer.ts
new file mode 100644
index 0000000..f42b5df
--- /dev/null
+++ b/bcp/src/app/google-maps-clusterer/map-marker-clusterer.ts
@@ -0,0 +1,198 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+// Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1265
+/// <reference types="google.maps" />
+
+import {
+  AfterContentInit,
+  ChangeDetectionStrategy,
+  Component,
+  ContentChildren,
+  Input,
+  NgZone,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+  QueryList,
+  SimpleChanges,
+  ViewEncapsulation,
+} from '@angular/core';
+import { Observable, Subscription } from 'rxjs';
+
+import { GoogleMap } from '@angular/google-maps';
+import { MapEventManager, MapMarker } from '@angular/google-maps';
+import { MarkerClusterer, MarkerClustererOptions } from '@googlemaps/markerclusterer'
+
+/**
+ * Angular component for implementing a Google Maps Marker Clusterer.
+ *
+ * See https://developers.google.com/maps/documentation/javascript/marker-clustering
+ */
+@Component({
+  selector: 'new-map-marker-clusterer',
+  exportAs: 'mapMarkerClusterer',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  template: '<ng-content></ng-content>',
+  encapsulation: ViewEncapsulation.None,
+})
+export class MapMarkerClusterer implements OnInit, OnChanges, AfterContentInit, OnDestroy {
+  private readonly _currentMarkers = new Set<google.maps.Marker>();
+  private readonly _closestMapEventManager = new MapEventManager(this._ngZone);
+  private _markersSubscription = Subscription.EMPTY;
+  private _apiSubscription = Subscription.EMPTY;
+
+  /** Whether the clusterer is allowed to be initialized. */
+  private readonly _canInitialize: boolean;
+
+  /**
+   * Used to trigger the creation of the cluster
+   * Should be linked to when the API is loaded
+   */
+  @Input()
+  apiInitialized: Observable<void>;
+
+  /**
+   * Used to customize how the marker cluster is created.
+   * See https://googlemaps.github.io/js-markerclusterer/interfaces/MarkerClusterOptions.html.
+   */
+  @Input()
+  options: MarkerClustererOptions;
+
+
+
+  /** Emits when clustering has started. */
+  @Output() readonly clusteringbegin: Observable<void> =
+    this._closestMapEventManager.getLazyEmitter<void>('clusteringbegin');
+
+  /** Emits when clustering is done. */
+  @Output() readonly clusteringend: Observable<void> =
+    this._closestMapEventManager.getLazyEmitter<void>('clusteringend');
+
+
+  @ContentChildren(MapMarker, {descendants: true}) _markers: QueryList<MapMarker>;
+
+  /** Underlying MarkerClusterer object used to interact with Google Maps. */
+  markerClusterer?: MarkerClusterer;
+
+  constructor(private readonly _googleMap: GoogleMap, private readonly _ngZone: NgZone) {
+    this._canInitialize = this._googleMap._isBrowser;
+  }
+
+  ngOnInit() {
+    this._apiSubscription = this.apiInitialized.subscribe(_ => {
+      if (this._canInitialize) {
+        this._createCluster();
+        this._watchForMarkerChanges();
+
+        // The `clusteringbegin` and `clusteringend` events are
+        // emitted on the map so that's why set it as the target.
+        this._closestMapEventManager.setTarget(this._googleMap.googleMap!);
+      }
+    })
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    const change = changes['renderer'] || changes['algorithm'];
+
+    // Since the options are set in the constructor, we have to recreate the cluster if they change.
+    if (this.markerClusterer && change && !change.isFirstChange()) {
+      this._watchForMarkerChanges();
+    }
+  }
+
+  ngAfterContentInit() {
+
+
+  }
+
+  ngOnDestroy() {
+    this._markersSubscription.unsubscribe();
+    this._closestMapEventManager.destroy();
+    this._apiSubscription.unsubscribe();
+    this._destroyCluster();
+  }
+
+  private _watchForMarkerChanges() {
+    this._assertInitialized();
+    const initialMarkers: google.maps.Marker[] = [];
+    for (const marker of this._getInternalMarkers(this._markers.toArray())) {
+      this._currentMarkers.add(marker);
+      initialMarkers.push(marker);
+    }
+    this.markerClusterer.addMarkers(initialMarkers);
+
+    this._markersSubscription.unsubscribe();
+    this._markersSubscription = this._markers.changes.subscribe((markerComponents: MapMarker[]) => {
+      this._assertInitialized();
+      const newMarkers = new Set<google.maps.Marker>(this._getInternalMarkers(markerComponents));
+      const markersToAdd: google.maps.Marker[] = [];
+      const markersToRemove: google.maps.Marker[] = [];
+      for (const marker of Array.from(newMarkers)) {
+        if (!this._currentMarkers.has(marker)) {
+          this._currentMarkers.add(marker);
+          markersToAdd.push(marker);
+        }
+      }
+      for (const marker of Array.from(this._currentMarkers)) {
+        if (!newMarkers.has(marker)) {
+          markersToRemove.push(marker);
+        }
+      }
+      this.markerClusterer.addMarkers(markersToAdd, true);
+      this.markerClusterer.removeMarkers(markersToRemove, true);
+      this.markerClusterer.render();
+      for (const marker of markersToRemove) {
+        this._currentMarkers.delete(marker);
+      }
+    });
+  }
+
+  private _createCluster() {
+
+    this._destroyCluster();
+
+    // Create the object outside the zone so its events don't trigger change detection.
+    // We'll bring it back in inside the `MapEventManager` only for the events that the
+    // user has subscribed to.
+    this._ngZone.runOutsideAngular(() => {
+      this.options.map = this._googleMap.googleMap
+      this.markerClusterer = new MarkerClusterer(this.options);
+    });
+  }
+
+  private _destroyCluster() {
+    // TODO(crisbeto): the naming here seems odd, but the `MarkerCluster` method isn't
+    // exposed. All this method seems to do at the time of writing is to call into `reset`.
+    // See: https://github.com/googlemaps/js-markerclusterer/blob/main/src/markerclusterer.ts#L205
+    this.markerClusterer?.onRemove();
+    this.markerClusterer = undefined;
+  }
+
+  private _getInternalMarkers(markers: MapMarker[]): google.maps.Marker[] {
+    return markers
+      .filter(markerComponent => !!markerComponent.marker)
+      .map(markerComponent => markerComponent.marker!);
+  }
+
+  private _assertInitialized(): asserts this is {markerClusterer: MarkerClusterer} {
+    if (!this._googleMap.googleMap) {
+      throw Error(
+        'Cannot access Google Map information before the API has been initialized. ' +
+          'Please wait for the API to load before trying to interact with it.',
+      );
+    }
+    if (!this.markerClusterer) {
+      throw Error(
+        'Cannot interact with a MarkerClusterer before it has been initialized. ' +
+          'Please wait for the MarkerClusterer to load before trying to interact with it.',
+      );
+    }
+  }
+}
\ No newline at end of file
diff --git a/bcp/src/index.html b/bcp/src/index.html
index 36ca98e..9700969 100644
--- a/bcp/src/index.html
+++ b/bcp/src/index.html
@@ -19,7 +19,7 @@
     <script>
       (g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
         v: "weekly",
-        key: AIzaSyAjR85QEAekYmsSyDPETXxprFpnEsdgjjU
+        key: "AIzaSyAjR85QEAekYmsSyDPETXxprFpnEsdgjjU"
       });
     </script>
     <link rel="preconnect" href="https://fonts.gstatic.com">
diff --git a/bcp/tsconfig.app.json b/bcp/tsconfig.app.json
index f758d98..4139358 100644
--- a/bcp/tsconfig.app.json
+++ b/bcp/tsconfig.app.json
@@ -2,7 +2,9 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
-    "types": []
+    "types": [
+      "google.maps"
+    ]
   },
   "files": [
     "src/main.ts",
diff --git a/bcp/tsconfig.json b/bcp/tsconfig.json
index 606304b..b7d6b87 100644
--- a/bcp/tsconfig.json
+++ b/bcp/tsconfig.json
@@ -24,6 +24,7 @@
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
+    "strictInjectionParameters": true,
+    "allowSyntheticDefaultImports": true
   }
 }
diff --git a/data.py b/data.py
index 2db40e1..4fa2a18 100644
--- a/data.py
+++ b/data.py
@@ -44,7 +44,7 @@
           'category': GUN_CATEGORIES, 'status': GUN_STATUS}
 SITE_TYPES = ("google", "osm", "other")
 
-PAGE_SIZE = 50
+PAGE_SIZE = 200
         
 class Gun(ndb.Model):
     class Types(Enum):
diff --git a/requirements.txt b/requirements.txt
index dfbbe5a..efaa8e9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 Flask==2.2.5
+protobuf==3.20.0
 googlemaps
 Jinja2
 simplejson