Switch to mercator map projection

4 files changed, 6 insertions, 23 deletions

diff --git a/gui/package-lock.json b/gui/package-lock.json
index 27ef799f6a..ff5cb53d94 100644
--- a/gui/package-lock.json
+++ b/gui/package-lock.json
@@ -3214,17 +3214,6 @@
         "d3-array": "1"
       }
     },
-    "d3-geo-projection": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-2.7.0.tgz",
-      "integrity": "sha512-G8C/8gvUQVwuLloW88d/NGbyh5CLONowQzU6gB7cczfGbSjMrQHFbaCqipWUqUWaBdqpyfTlLE3GPGy0RMpKYw==",
-      "requires": {
-        "commander": "2",
-        "d3-array": "1",
-        "d3-geo": "^1.10.0",
-        "resolve": "^1.1.10"
-      }
-    },
     "d3-interpolate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
@@ -10028,7 +10017,8 @@
     "path-parse": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
     },
     "path-root": {
       "version": "0.1.1",
@@ -10894,6 +10884,7 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
       "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+      "dev": true,
       "requires": {
         "path-parse": "^1.0.6"
       }
diff --git a/gui/package.json b/gui/package.json
index 398f97ce61..d1c80bc418 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -15,7 +15,7 @@
     "@grpc/grpc-js": "^1.1.2",
     "argv-split": "^2.0.1",
     "connected-react-router": "^6.8.0",
-    "d3-geo-projection": "^2.7.0",
+    "d3-geo": "^1.12.1",
     "electron-log": "^4.1.1",
     "gettext-parser": "^4.0.3",
     "google-protobuf": "^4.0.0-rc.2",
diff --git a/gui/src/renderer/components/SvgMap.tsx b/gui/src/renderer/components/SvgMap.tsx
index 6a9bb6b6e6..571d68e123 100644
--- a/gui/src/renderer/components/SvgMap.tsx
+++ b/gui/src/renderer/components/SvgMap.tsx
@@ -1,4 +1,4 @@
-import { geoTimes } from 'd3-geo-projection';
+import { geoMercator, GeoProjection } from 'd3-geo';
 import rbush from 'rbush';
 import * as React from 'react';
 import { ComposableMap, Geographies, Geography, Marker, ZoomableGroup } from 'react-simple-maps';
@@ -9,9 +9,6 @@ import statesProvincesLinesData from '../../../assets/geo/states-provinces-lines
 import geometryTreeData from '../../../assets/geo/geometry.rbush.json';
 import statesProvincesLinesTreeData from '../../../assets/geo/states-provinces-lines.rbush.json';
 
-// Infer the GeoProjection type from the `geoTimes()` return value
-type GeoProjection = ReturnType<typeof geoTimes>;
-
 interface IGeometryLeaf extends rbush.BBox {
   id: string;
 }
@@ -196,7 +193,7 @@ export default class SvgMap extends React.Component<IProps, IState> {
     height: number = this.props.height,
     offset: [number, number] = this.props.offset,
   ) {
-    return geoTimes()
+    return geoMercator()
       .scale(this.projectionConfig.scale)
       .translate([offset[0] + width / 2, offset[1] + height / 2])
       .precision(0.1);
diff --git a/gui/types/d3-geo-projection/index.d.ts b/gui/types/d3-geo-projection/index.d.ts
deleted file mode 100644
index 0f6de59ba2..0000000000
--- a/gui/types/d3-geo-projection/index.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare module 'd3-geo-projection' {
-  import { GeoProjection } from 'd3-geo';
-
-  export function geoTimes(): GeoProjection;
-}