PR review comment addressed

__tests__/components/UserLocation.test.js

@@ -37,15 +37,12 @@ describe('UserLocation', () => {
 
     test('renders with CircleLayers by default', (done) => {
       const {UNSAFE_getAllByType} = render(<UserLocation />);
+      const shapeSource = UNSAFE_getAllByType(ShapeSource);
+      const circleLayer = UNSAFE_getAllByType(CircleLayer);
 
-      setTimeout(() => {
-        const shapeSource = UNSAFE_getAllByType(ShapeSource);
-        const circleLayer = UNSAFE_getAllByType(CircleLayer);
-
-        expect(shapeSource.length).toBe(1);
-        expect(circleLayer.length).toBe(3);
-        done();
-      });
+      expect(shapeSource.length).toBe(1);
+      expect(circleLayer.length).toBe(3);
+      done();
     });
 
     test('does not render with visible set to false', (done) => {
@@ -187,7 +184,7 @@ describe('UserLocation', () => {
 
         expect(ul._isLocationManagerRequired).toStrictEqual(true);
         expect(locationManager.start).toHaveBeenCalledTimes(1);
-        expect(locationManager.getLastKnownLocation).toHaveBeenCalledTimes(1);
+        expect(locationManager.getLastKnownLocation).not.toHaveBeenCalled();
         expect(ul.setState).toHaveBeenCalledTimes(1);
         expect(ul.setState).toHaveBeenCalledWith({
           coordinates: lastKnownLocation,
@@ -216,29 +213,29 @@ describe('UserLocation', () => {
     describe('#isLocationManagerRequired', () => {
       test('returns true correctly', () => {
         // default props "onUpdate: undefined, visible: true"
-        expect(ul.isLocationManagerRequired()).toStrictEqual(true);
+        expect(ul.checkLocationManagerRequired()).toStrictEqual(true);
 
         ul.props = {
           onUpdate: () => {},
           visible: true,
         };
 
-        expect(ul.isLocationManagerRequired()).toStrictEqual(true);
+        expect(ul.checkLocationManagerRequired()).toStrictEqual(true);
 
         ul.props = {
           onUpdate: () => {},
           visible: false,
         };
 
-        expect(ul.isLocationManagerRequired()).toStrictEqual(true);
+        expect(ul.checkLocationManagerRequired()).toStrictEqual(true);
       });
 
       test('returns false correctly', () => {
         ul.props = {
           visible: false,
         };
 
-        expect(ul.isLocationManagerRequired()).toStrictEqual(false);
+        expect(ul.checkLocationManagerRequired()).toStrictEqual(false);
       });
     });
 

__tests__/modules/location/locationManager.test.js

@@ -89,12 +89,13 @@ describe('LocationManager', () => {
         expect(myListener).not.toHaveBeenCalled();
       });
 
-      test('listener is not called just after being added', () => {
+      test('calls listener with "lastKnownLocation"', () => {
         locationManager._lastKnownLocation = location;
 
         locationManager.addListener(myListener);
         expect(locationManager._listeners).toStrictEqual([myListener]);
-        expect(myListener).not.toHaveBeenCalled();
+        expect(myListener).toHaveBeenCalledWith(location);
+        expect(myListener).toHaveBeenCalledTimes(1);
       });
     });
 
@@ -108,16 +109,22 @@ describe('LocationManager', () => {
 
         locationManager.addListener(listenerA);
         expect(locationManager._listeners).toStrictEqual([listenerA]);
+        expect(MapboxGLLocationManager.stop).not.toHaveBeenCalled();
+
         locationManager.addListener(listenerB);
         expect(locationManager._listeners).toStrictEqual([
           listenerA,
           listenerB,
         ]);
+        expect(MapboxGLLocationManager.stop).not.toHaveBeenCalled();
 
         locationManager.removeListener(listenerB);
         expect(locationManager._listeners).toStrictEqual([listenerA]);
+        expect(MapboxGLLocationManager.stop).not.toHaveBeenCalled();
+
         locationManager.removeListener(listenerA);
         expect(locationManager._listeners).toStrictEqual([]);
+        expect(MapboxGLLocationManager.stop).toHaveBeenCalledTimes(1);
       });
     });
 

javascript/components/UserLocation.js

@@ -143,7 +143,7 @@ class UserLocation extends React.Component {
     this._isMounted = true;
 
     await this.setLocationManager({
-      required: this.isLocationManagerRequired(),
+      required: this.checkLocationManagerRequired(),
     });
 
     if (this.renderMode === UserLocation.RenderMode.Native) {
@@ -155,7 +155,7 @@ class UserLocation extends React.Component {
 
   async componentDidUpdate(prevProps) {
     await this.setLocationManager({
-      required: this.isLocationManagerRequired(),
+      required: this.checkLocationManagerRequired(),
     });
 
     if (this.props.minDisplacement !== prevProps.minDisplacement) {
@@ -183,8 +183,6 @@ class UserLocation extends React.Component {
       this._isLocationManagerRequired = required;
       if (required) {
         locationManager.addListener(this._onLocationUpdate);
-        const location = await locationManager.getLastKnownLocation();
-        this._onLocationUpdate(location);
       } else {
         locationManager.removeListener(this._onLocationUpdate);
       }
@@ -193,11 +191,11 @@ class UserLocation extends React.Component {
 
   /**
    *
-   * If locationManager is required.
+   * Checks if locationManager is required.
    *
-   * @return {boolean}
+   * @return {boolean} True is required
    */
-  isLocationManagerRequired() {
+  checkLocationManagerRequired() {
     if (this.props.renderMode === UserLocation.RenderMode.Native) {
       return false;
     }

javascript/modules/location/locationManager.js

@@ -43,6 +43,10 @@ class LocationManager {
     }
     if (!this._listeners.includes(listener)) {
       this._listeners.push(listener);
+
+      if (this._lastKnownLocation) {
+        listener(this._lastKnownLocation);
+      }
     }
   }