Merge branch 'master' into patch-1

visgl · Jul 5, 2024 · 3af6098 · 3af6098
2 parents 9ce9a3c + 2c369d0
commit 3af6098
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/docs/api-reference/map.md b/docs/api-reference/map.md
@@ -1,6 +1,6 @@
 # default (Map)
 
-React component that wraps the base library's `Map` class ([Mapbox](https://docs.mapbox.com/mapbox-gl-js/api/map/) | [Maplibre](https://maplibre.org/maplibre-gl-js-docs/api/map/)). This is also the default export from react-map-gl.
+React component that wraps the base library's `Map` class ([Mapbox](https://docs.mapbox.com/mapbox-gl-js/api/map/) | [Maplibre](https://maplibre.org/maplibre-gl-js/docs/API/classes/Map/)). This is also the default export from react-map-gl.
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';

diff --git a/src/utils/transform.ts b/src/utils/transform.ts
@@ -57,12 +57,6 @@ export function applyViewStateToTransform(tr: Transform, props: MapboxProps): bo
   const v: Partial<ViewState> = props.viewState || props;
   let changed = false;
 
-  if ('longitude' in v && 'latitude' in v) {
-    const center = tr.center;
-    // @ts-ignore
-    tr.center = new center.constructor(v.longitude, v.latitude);
-    changed = changed || center !== tr.center;
-  }
   if ('zoom' in v) {
     const zoom = tr.zoom;
     tr.zoom = v.zoom;
@@ -82,5 +76,11 @@ export function applyViewStateToTransform(tr: Transform, props: MapboxProps): bo
     changed = true;
     tr.padding = v.padding;
   }
+  if ('longitude' in v && 'latitude' in v) {
+    const center = tr.center;
+    // @ts-ignore
+    tr.center = new center.constructor(v.longitude, v.latitude);
+    changed = changed || center !== tr.center;
+  }
   return changed;
 }
diff --git a/test/src/utils/transform.spec.js b/test/src/utils/transform.spec.js
@@ -90,5 +90,11 @@ test('applyViewStateToTransform', t => {
   changed = applyViewStateToTransform(tr, {viewState: {pitch: 30}});
   t.notOk(changed, 'nothing changed');
 
+  applyViewStateToTransform(tr, {longitude: 0, latitude: 0, zoom: 0});
+  changed = applyViewStateToTransform(tr, {longitude: 12, latitude: 34, zoom: 15});
+  t.ok(changed, 'center and zoom changed');
+  t.equal(tr.zoom, 15, 'zoom is correct');
+  t.equal(tr.center.lat, 34, 'center latitude is correct');
+
   t.end();
 });