summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-09-03 16:37:42 +0200
committerOskar Nyberg <oskar@mullvad.net>2020-09-10 10:03:47 +0200
commitcfdb1cd3c782291053da509dc69acffbef0a3d1e (patch)
tree427b60f34150d57eb7146d4c978229b5d3391cf5 /gui/src
parent06c0ca7263b91d9ad2942f1c0117649448ec09ee (diff)
downloadmullvadvpn-cfdb1cd3c782291053da509dc69acffbef0a3d1e.tar.xz
mullvadvpn-cfdb1cd3c782291053da509dc69acffbef0a3d1e.zip
Switch to mercator map projection
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/renderer/components/SvgMap.tsx7
1 files changed, 2 insertions, 5 deletions
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);