Update rbush and @types/rbush

4 files changed, 31 insertions, 31 deletions

diff --git a/gui/package-lock.json b/gui/package-lock.json
index 25c472bc72..09a98266a9 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -16,7 +16,7 @@
         "gettext-parser": "^6.0.0",
         "google-protobuf": "^3.21.0",
         "node-gettext": "^3.0.0",
-        "rbush": "^2.0.2",
+        "rbush": "^3.0.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-redux": "^7.2.9",
@@ -38,7 +38,7 @@
         "@types/mocha": "^10.0.0",
         "@types/node": "^16.11.26",
         "@types/node-gettext": "^3.0.3",
-        "@types/rbush": "^2.0.2",
+        "@types/rbush": "^3.0.0",
         "@types/react": "^18.0.21",
         "@types/react-dom": "^18.0.6",
         "@types/react-router": "^5.1.19",
@@ -1429,9 +1429,9 @@
       "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
     },
     "node_modules/@types/rbush": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/rbush/-/rbush-2.0.2.tgz",
-      "integrity": "sha1-0pdWRoBJGXOrncXsOv10cEh/Uwo=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/rbush/-/rbush-3.0.0.tgz",
+      "integrity": "sha512-W3ue/GYWXBOpkRm0VSoifrP3HV0Ni47aVJWvXyWMcbtpBy/l/K/smBRiJ+fI8f7shXRjZBiux+iJzYbh7VmcZg==",
       "dev": true
     },
     "node_modules/@types/react": {
@@ -11171,9 +11171,9 @@
       ]
     },
     "node_modules/quickselect": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-1.1.1.tgz",
-      "integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
+      "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
@@ -11195,11 +11195,11 @@
       }
     },
     "node_modules/rbush": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/rbush/-/rbush-2.0.2.tgz",
-      "integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz",
+      "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==",
       "dependencies": {
-        "quickselect": "^1.0.1"
+        "quickselect": "^2.0.0"
       }
     },
     "node_modules/rc": {
@@ -15364,9 +15364,9 @@
       "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
     },
     "@types/rbush": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/rbush/-/rbush-2.0.2.tgz",
-      "integrity": "sha1-0pdWRoBJGXOrncXsOv10cEh/Uwo=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/rbush/-/rbush-3.0.0.tgz",
+      "integrity": "sha512-W3ue/GYWXBOpkRm0VSoifrP3HV0Ni47aVJWvXyWMcbtpBy/l/K/smBRiJ+fI8f7shXRjZBiux+iJzYbh7VmcZg==",
       "dev": true
     },
     "@types/react": {
@@ -23065,9 +23065,9 @@
       "dev": true
     },
     "quickselect": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-1.1.1.tgz",
-      "integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
+      "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
     },
     "randombytes": {
       "version": "2.1.0",
@@ -23089,11 +23089,11 @@
       }
     },
     "rbush": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/rbush/-/rbush-2.0.2.tgz",
-      "integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz",
+      "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==",
       "requires": {
-        "quickselect": "^1.0.1"
+        "quickselect": "^2.0.0"
       }
     },
     "rc": {
diff --git a/gui/package.json b/gui/package.json
index 133fa27f79..ec2ab566d8 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -18,7 +18,7 @@
     "gettext-parser": "^6.0.0",
     "google-protobuf": "^3.21.0",
     "node-gettext": "^3.0.0",
-    "rbush": "^2.0.2",
+    "rbush": "^3.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-redux": "^7.2.9",
@@ -44,7 +44,7 @@
     "@types/mocha": "^10.0.0",
     "@types/node": "^16.11.26",
     "@types/node-gettext": "^3.0.3",
-    "@types/rbush": "^2.0.2",
+    "@types/rbush": "^3.0.0",
     "@types/react": "^18.0.21",
     "@types/react-dom": "^18.0.6",
     "@types/react-router": "^5.1.19",
diff --git a/gui/scripts/prepare-rtree.ts b/gui/scripts/prepare-rtree.ts
index 27fabb2f13..2252e829a9 100644
--- a/gui/scripts/prepare-rtree.ts
+++ b/gui/scripts/prepare-rtree.ts
@@ -6,7 +6,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { Topology, GeometryCollection } from 'topojson-specification';
-import rbush from 'rbush';
+import RBush from 'rbush';
 
 interface GeometryTopologyObjects {
   [key: string]: any;
@@ -51,7 +51,7 @@ function processGeometry(source: string, destination: string) {
     };
   });
 
-  const tree = rbush();
+  const tree = new RBush();
   tree.load(treeData);
   fs.writeFileSync(destination, JSON.stringify(tree.toJSON()));
 
diff --git a/gui/src/renderer/components/SvgMap.tsx b/gui/src/renderer/components/SvgMap.tsx
index 00745bede2..680facb558 100644
--- a/gui/src/renderer/components/SvgMap.tsx
+++ b/gui/src/renderer/components/SvgMap.tsx
@@ -1,5 +1,5 @@
 import { geoMercator, GeoProjection } from 'd3-geo';
-import rbush from 'rbush';
+import RBush, { BBox as RBushBBox } from 'rbush';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { ComposableMap, Geographies, Geography, Marker } from 'react-simple-maps';
 
@@ -8,16 +8,16 @@ import geometryTreeData from '../../../assets/geo/geometry.rbush.json';
 import statesProvincesLinesData from '../../../assets/geo/states-provinces-lines.json';
 import statesProvincesLinesTreeData from '../../../assets/geo/states-provinces-lines.rbush.json';
 
-interface IGeometryLeaf extends rbush.BBox {
+interface IGeometryLeaf extends RBushBBox {
   id: string;
 }
 
-interface IProvinceAndStateLineLeaf extends rbush.BBox {
+interface IProvinceAndStateLineLeaf extends RBushBBox {
   id: string;
 }
 
-const geometryTree = rbush<IGeometryLeaf>().fromJSON(geometryTreeData);
-const provincesStatesLinesTree = rbush<IProvinceAndStateLineLeaf>().fromJSON(
+const geometryTree = new RBush<IGeometryLeaf>().fromJSON(geometryTreeData);
+const provincesStatesLinesTree = new RBush<IProvinceAndStateLineLeaf>().fromJSON(
   statesProvincesLinesTreeData,
 );