Move map attribution to top right (#8621)

Signed-off-by: Michael Weimann <[email protected]> Co-authored-by: Michael Telatynski <[email protected]>
matrix-org · May 23, 2022 · 1535ff0 · 1535ff0
1 parent 764b307
commit 1535ff0
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 13 deletions.
diff --git a/src/utils/location/map.ts b/src/utils/location/map.ts
@@ -36,7 +36,9 @@ export const createMap = (
             style: styleUrl,
             zoom: 15,
             interactive,
+            attributionControl: false,
         });
+        map.addControl(new maplibregl.AttributionControl(), 'top-right');
 
         map.on('error', (e) => {
             logger.error(

diff --git a/test/components/views/beacon/BeaconViewDialog-test.tsx b/test/components/views/beacon/BeaconViewDialog-test.tsx
@@ -89,6 +89,10 @@ describe('<BeaconViewDialog />', () => {
     const getComponent = (props = {}) =>
         mount(<BeaconViewDialog {...defaultProps} {...props} />);
 
+    beforeAll(() => {
+        maplibregl.AttributionControl = jest.fn();
+    });
+
     beforeEach(() => {
         jest.spyOn(OwnBeaconStore.instance, 'getLiveBeaconIds').mockRestore();
 

diff --git a/test/components/views/location/LocationViewDialog-test.tsx b/test/components/views/location/LocationViewDialog-test.tsx
@@ -18,6 +18,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { RoomMember } from 'matrix-js-sdk/src/matrix';
 import { LocationAssetType } from 'matrix-js-sdk/src/@types/location';
+import maplibregl from 'maplibre-gl';
 
 import LocationViewDialog from '../../../../src/components/views/location/LocationViewDialog';
 import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
@@ -41,6 +42,10 @@ describe('<LocationViewDialog />', () => {
     const getComponent = (props = {}) =>
         mount(<LocationViewDialog {...defaultProps} {...props} />);
 
+    beforeAll(() => {
+        maplibregl.AttributionControl = jest.fn();
+    });
+
     it('renders map correctly', () => {
         const component = getComponent();
         expect(component.find('Map')).toMatchSnapshot();

diff --git a/test/components/views/location/Map-test.tsx b/test/components/views/location/Map-test.tsx
@@ -44,6 +44,10 @@ describe('<Map />', () => {
             wrappingComponentProps: { value: matrixClient },
         });
 
+    beforeAll(() => {
+        maplibregl.AttributionControl = jest.fn();
+    });
+
     beforeEach(() => {
         jest.clearAllMocks();
         matrixClient.getClientWellKnown.mockReturnValue({

diff --git a/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap b/test/components/views/location/__snapshots__/LocationViewDialog-test.tsx.snap
@@ -23,7 +23,20 @@ exports[`<LocationViewDialog /> renders map correctly 1`] = `
           },
           "_eventsCount": 1,
           "_maxListeners": undefined,
-          "addControl": [MockFunction],
+          "addControl": [MockFunction] {
+            "calls": Array [
+              Array [
+                mockConstructor {},
+                "top-right",
+              ],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": undefined,
+              },
+            ],
+          },
           "fitBounds": [MockFunction],
           "removeControl": [MockFunction],
           "setCenter": [MockFunction] {
@@ -78,7 +91,20 @@ exports[`<LocationViewDialog /> renders map correctly 1`] = `
           },
           "_eventsCount": 1,
           "_maxListeners": undefined,
-          "addControl": [MockFunction],
+          "addControl": [MockFunction] {
+            "calls": Array [
+              Array [
+                mockConstructor {},
+                "top-right",
+              ],
+            ],
+            "results": Array [
+              Object {
+                "type": "return",
+                "value": undefined,
+              },
+            ],
+          },
           "fitBounds": [MockFunction],
           "removeControl": [MockFunction],
           "setCenter": [MockFunction] {

diff --git a/test/components/views/messages/MBeaconBody-test.tsx b/test/components/views/messages/MBeaconBody-test.tsx
@@ -79,6 +79,11 @@ describe('<MBeaconBody />', () => {
         });
 
     const modalSpy = jest.spyOn(Modal, 'createTrackedDialog').mockReturnValue(undefined);
+
+    beforeAll(() => {
+        maplibregl.AttributionControl = jest.fn();
+    });
+
     beforeEach(() => {
         jest.clearAllMocks();
     });

diff --git a/test/components/views/messages/MLocationBody-test.tsx b/test/components/views/messages/MLocationBody-test.tsx
@@ -56,6 +56,15 @@ describe("MLocationBody", () => {
             wrappingComponent: MatrixClientContext.Provider,
             wrappingComponentProps: { value: mockClient },
         });
+
+        beforeAll(() => {
+            maplibregl.AttributionControl = jest.fn();
+        });
+
+        beforeEach(() => {
+            jest.clearAllMocks();
+        });
+
         describe('with error', () => {
             let sdkConfigSpy;
 

diff --git a/test/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap b/test/components/views/messages/__snapshots__/MLocationBody-test.tsx.snap
@@ -124,7 +124,20 @@ exports[`MLocationBody <MLocationBody> without error renders map correctly 1`] =
                     },
                     "_eventsCount": 1,
                     "_maxListeners": undefined,
-                    "addControl": [MockFunction],
+                    "addControl": [MockFunction] {
+                      "calls": Array [
+                        Array [
+                          mockConstructor {},
+                          "top-right",
+                        ],
+                      ],
+                      "results": Array [
+                        Object {
+                          "type": "return",
+                          "value": undefined,
+                        },
+                      ],
+                    },
                     "fitBounds": [MockFunction],
                     "removeControl": [MockFunction],
                     "setCenter": [MockFunction] {
@@ -135,22 +148,12 @@ exports[`MLocationBody <MLocationBody> without error renders map correctly 1`] =
                             "lon": -0.1276,
                           },
                         ],
-                        Array [
-                          Object {
-                            "lat": 51.5076,
-                            "lon": -0.1276,
-                          },
-                        ],
                       ],
                       "results": Array [
                         Object {
                           "type": "return",
                           "value": undefined,
                         },
-                        Object {
-                          "type": "return",
-                          "value": undefined,
-                        },
                       ],
                     },
                     "setStyle": [MockFunction],