mobility-toolbox-js 1.5.0 → 1.6.0-beta.10

package/api/trajserv/TrajservAPIUtils.test.js

@@ -2,7 +2,7 @@ import { translateTrajStationsResp } from './TrajservAPIUtils';
 
 describe('TrajservAPIUtils', () => {
   describe('#translateTrajStationsResp', () => {
-    test.only("should success even if data doesn't have all properties set", () => {
+    test("should success even if data doesn't have all properties set", () => {
       const empty = {
         backgroundColor: undefined,
         bicyclesAllowed: false,

package/api/tralis/TralisAPI.js

@@ -44,7 +44,7 @@ class TralisAPI {
    * @param {string} options.url Service url.
    * @param {string} options.apiKey Access key for [geOps services](https://developer.geops.io/).
    * @param {string} [options.prefix=''] Service prefix to specify tenant.
-   * @param {string} [options.projection='epsg:3857'] The epsg code of the projection for features.
+   * @param {string} [options.projection] The epsg code of the projection for features.
    * @param {number[4]} [options.bbox=[minX, minY, maxX, maxY] The bounding box to receive data from.
    */
   constructor(options = {}) {
@@ -60,6 +60,12 @@ class TralisAPI {
       wsUrl = `${wsUrl}?key=${options.apiKey}`;
     }
 
+    /** @ignore */
+    this.bbox = options.bbox;
+
+    /** @ignore */
+    this.projection = options.projection || 'EPSG:3857';
+
     /** @ignore */
     this.subscribedStationUic = null;
 
@@ -75,15 +81,47 @@ class TralisAPI {
     /** @ignore */
     this.prefix = options.prefix || '';
 
+    this.isUpdateBboxOnMoveEnd = options.isUpdateBboxOnMoveEnd || false;
+
     /** @ignore */
     this.conn = new WebSocketConnector(wsUrl);
-    this.conn.setProjection(options.projection || 'epsg:3857');
 
-    if (options.bbox) {
-      this.conn.setBbox(options.bbox);
+    if (options.projection) {
+      this.setProjection(options.projection);
     }
   }
 
+  /**
+   * Send the projection to use. Default to EPSG:3857.
+   *
+   * @param {string} epsgCode The EPSG code of the projection.
+   */
+  setProjection(epsgCode) {
+    this.conn.send(`PROJECTION ${epsgCode}`);
+  }
+
+  /**
+   * Send the bbox to the service, if the first time it will also subscribe to trajectory and deleted_vehicles channels.
+   *
+   * @param {number[5]} bbox The bounding box and the zoom level to receive data from.
+   */
+  setBbox(bbox) {
+    /**
+     * The BBOX for websocket responses
+     * @type {Array<number>}
+     */
+    this.bbox = bbox;
+    this.conn.send(`BBOX ${bbox.join(' ')}`);
+  }
+
+  /**
+   * Unsubscribe trajectory and deleted_vehicles channels. To resubscribe you have to set a new BBOX.
+   */
+  // eslint-disable-next-line class-methods-use-this
+  reset() {
+    this.conn.send('RESET');
+  }
+
   /**
    * Subscribe to a channel.
    *
@@ -98,7 +136,7 @@ class TralisAPI {
   }
 
   /**
-   * Unsubscribe to a channel.
+   * Unsubscribe both modes of a channel.
    *
    * @param {string} channel Name of the websocket channel to unsubscribe.
    * @param {string} [suffix=''] Suffix to add to the channel name.
@@ -377,7 +415,12 @@ class TralisAPI {
    */
   subscribeTrajectory(mode, onMessage) {
     this.unsubscribeTrajectory(onMessage);
-    this.subscribe(`trajectory${getModeSuffix(mode, TralisModes)}`, onMessage);
+    this.subscribe(
+      `trajectory${getModeSuffix(mode, TralisModes)}`,
+      onMessage,
+      null,
+      this.isUpdateBboxOnMoveEnd,
+    );
   }
 
   /**
@@ -399,6 +442,8 @@ class TralisAPI {
     this.subscribe(
       `deleted_vehicles${getModeSuffix(mode, TralisModes)}`,
       onMessage,
+      null,
+      this.isUpdateBboxOnMoveEnd,
     );
   }
 

package/api/tralis/WebSocketConnector.js

@@ -1,5 +1,7 @@
 /**
- * Class use to facilitate connection to a WebSocket
+ * Class use to facilitate connection to a WebSocket.
+ * This class must not conatain any specific WebSocket implementation.
+ *
  * @private
  */
 class WebSocketConnector {
@@ -7,19 +9,29 @@ class WebSocketConnector {
     /**
      * Array of subscriptions.
      * @type {Array<subscription>}
+     * @private
      */
     this.subscriptions = [];
+
+    /**
+     * List of channels subscribed.
+     * @type {Array<subscription>}
+     * @private
+     */
+    this.subscribed = {};
+
+    // Connect the websocket
     this.connect(url);
 
     // keep websocket alive
     setInterval(() => {
       this.send('PING');
     }, 10000);
-    this.subscribed = {};
   }
 
   /**
    * Get the websocket request string.
+   *
    * @param {string} method Request mehtod {GET, SUB}.
    * @param {Object} params Request parameters.
    * @param {string} params.channel Channel name
@@ -37,6 +49,7 @@ class WebSocketConnector {
 
   /**
    * (Re)connect the websocket.
+   *
    * @param {string} url url to connect to
    * @private
    */
@@ -48,16 +61,8 @@ class WebSocketConnector {
     /** @ignore */
     this.websocket = new WebSocket(url);
 
-    if (this.currentProj) {
-      this.setProjection(this.currentProj);
-    }
-
-    if (this.currentBbox) {
-      this.setBbox(this.currentBbox);
-    }
-
     [...this.subscriptions].forEach((s) => {
-      this.subscribe(s.params, s.cb, s.errorCb, true);
+      this.subscribe(s.params, s.cb, s.errorCb, s.quiet);
     });
 
     // reconnect on close
@@ -70,6 +75,7 @@ class WebSocketConnector {
 
   /**
    * Sends a get request to the websocket.
+   *
    * @param {Object} params Parameters for the websocket get request
    * @param {function} cb callback on listen
    * @param {function} errorCb Callback on error
@@ -83,6 +89,7 @@ class WebSocketConnector {
 
   /**
    * Sends a message to the websocket.
+   *
    * @param {message} message Message to send.
    * @private
    */
@@ -90,7 +97,6 @@ class WebSocketConnector {
     const send = () => {
       this.websocket.send(message);
     };
-
     if (this.websocket.readyState === WebSocket.CONNECTING) {
       this.websocket.addEventListener('open', send);
     } else {
@@ -99,50 +105,20 @@ class WebSocketConnector {
   }
 
   /**
-   * Set the projection for websocket responses.
-   * @param {string} value projection value to be set
-   * @private
-   */
-  setProjection(value) {
-    /**
-     * The projection for websocket responses
-     * @type {string}
-     */
-    this.currentProj = value;
-    this.send(`PROJECTION ${value}`);
-  }
-
-  /**
-   * Set the BBOX for websocket responses.
-   *  @param {Array<Array<number>>} coordinates array of coordinates
-   * @private
-   */
-  setBbox(coordinates) {
-    /**
-     * The BBOX for websocket responses
-     * @type {Array<Array<number>>}
-     */
-    this.currentBbox = coordinates;
-    this.send(`BBOX ${coordinates.join(' ')}`);
-    this.subscriptions.forEach((s) => {
-      this.get(s.params, s.cb, s.errorCb);
-    });
-  }
-
-  /**
-   * Listen to websocket responses.
-   * @private
+   * Listen to websocket messages.
+   *
    * @param {Object} params Parameters for the websocket get request
    * @param {function} cb callback on listen
    * @param {function} errorCb Callback on error
    * @returns {{onMessage: function, errorCb: function}} Object with onMessage and error callbacks
+   * @private
    */
   listen(params, cb, errorCb) {
     // Remove the previous identical callback
     this.unlisten(params, cb);
 
-    const onMessage = (e) => {
-      const data = JSON.parse(e.data);
+    const onMessage = (evt) => {
+      const data = JSON.parse(evt.data);
       let source = params.channel;
       source += params.args ? ` ${params.args}` : '';
 
@@ -164,6 +140,13 @@ class WebSocketConnector {
     return { onMessageCb: onMessage, onErrorCb: errorCb };
   }
 
+  /**
+   * Unlisten websocket messages.
+   *
+   * @param {Object} params Parameters for the websocket get request.
+   * @param {function} cb Callback used when listen.
+   * @private
+   */
   unlisten(params, cb) {
     this.subscriptions
       .filter((s) => {
@@ -180,31 +163,33 @@ class WebSocketConnector {
 
   /**
    * Subscribe to a given channel.
-   * @private
+   *
    * @param {Object} params Parameters for the websocket get request
    * @param {function} cb callback on listen
    * @param {function} errorCb Callback on error
-   * @param {boolean} quiet if subscribe should be quiet
+   * @param {boolean} quiet if false, no GET or SUB requests are send, only the callback is registered.
+   * @private
    */
-  subscribe(params, cb, errorCb, quiet) {
+  subscribe(params, cb, errorCb, quiet = false) {
     const { onMessageCb, onErrorCb } = this.listen(params, cb, errorCb);
     const reqStr = WebSocketConnector.getRequestString('', params);
 
-    if (!quiet) {
-      const index = this.subscriptions.findIndex((subcr) => {
-        return params.channel === subcr.params.channel && cb === subcr.cb;
-      });
-      const newSubscr = { params, cb, errorCb, onMessageCb, onErrorCb };
-      if (index > -1) {
-        this.subscriptions[index] = newSubscr;
-      } else {
-        this.subscriptions.push(newSubscr);
-      }
+    const index = this.subscriptions.findIndex((subcr) => {
+      return params.channel === subcr.params.channel && cb === subcr.cb;
+    });
+    const newSubscr = { params, cb, errorCb, onMessageCb, onErrorCb, quiet };
+    if (index > -1) {
+      this.subscriptions[index] = newSubscr;
+    } else {
+      this.subscriptions.push(newSubscr);
     }
 
     if (!this.subscribed[reqStr]) {
-      this.send(`GET ${reqStr}`);
-      this.send(`SUB ${reqStr}`);
+      if (!newSubscr.quiet) {
+        this.send(`GET ${reqStr}`);
+        this.send(`SUB ${reqStr}`);
+      }
+
       this.subscribed[reqStr] = true;
     }
   }
@@ -216,27 +201,29 @@ class WebSocketConnector {
    * @private
    */
   unsubscribe(source, cb) {
-    this.subscriptions
-      .filter((s) => {
-        return s.params.channel === source && (!cb || s.cb === cb);
-      })
-      .forEach(({ onMessageCb, onErrorCb }) => {
-        this.websocket.removeEventListener('message', onMessageCb);
-        if (onErrorCb) {
-          this.websocket.removeEventListener('error', onErrorCb);
-          this.websocket.removeEventListener('close', onErrorCb);
-        }
-      });
+    const toRemove = this.subscriptions.filter((s) => {
+      return s.params.channel === source && (!cb || s.cb === cb);
+    });
+
+    toRemove.forEach(({ onMessageCb, onErrorCb }) => {
+      this.websocket.removeEventListener('message', onMessageCb);
+      if (onErrorCb) {
+        this.websocket.removeEventListener('error', onErrorCb);
+        this.websocket.removeEventListener('close', onErrorCb);
+      }
+    });
 
     this.subscriptions = this.subscriptions.filter(
       (s) => s.params.channel !== source || (cb && s.cb !== cb),
     );
 
-    // If there is no more subscriptions to this channel we DEL it.
+    // If there is no more subscriptions to this channel, and the removed subscriptions didn't register quietly,
+    // we DEL it.
     if (
       source &&
       this.subscribed[source] &&
-      !this.subscriptions.find((s) => s.params.channel === source)
+      !this.subscriptions.find((s) => s.params.channel === source) &&
+      toRemove.find((subscr) => !subscr.quiet)
     ) {
       this.send(`DEL ${source}`);
       this.subscribed[source] = false;

package/api/tralis/WebSocketConnector.test.js

@@ -22,22 +22,85 @@ describe('WebSocketConnector', () => {
       expect(server).toHaveReceivedMessages(['hello']);
     });
 
-    test('#subscribe', async () => {
-      // eslint-disable-next-line no-unused-vars
-      const client = new Connector(`ws://foo:1234`);
-      const params = {};
-      const cb = jest.fn();
-      client.subscribe(params, cb);
-      expect(client.subscriptions.length).toBe(1);
-      expect(client.subscriptions[0].params).toBe(params);
-      expect(client.subscriptions[0].cb).toBe(cb);
+    describe('#subscribe', () => {
+      test('adds subscrption to subscriptions array', async () => {
+        // eslint-disable-next-line no-unused-vars
+        const client = new Connector(`ws://foo:1234`);
+        await server.connected;
+        const params = { channel: 'bar', args: ['baz'], id: 'id' };
+        const cb = jest.fn();
+        const errorCb = jest.fn();
+        client.subscribe(params, cb, errorCb);
+        expect(client.subscriptions.length).toBe(1);
+        expect(client.subscriptions[0].params).toBe(params);
+        expect(client.subscriptions[0].cb).toBe(cb);
+        expect(client.subscriptions[0].errorCb).toBe(errorCb);
+        expect(client.subscriptions[0].quiet).toBe(false);
+
+        const obj = { source: 'bar baz', client_reference: 'id' };
+        server.send(JSON.stringify(obj));
+
+        expect(cb).toHaveBeenCalledTimes(1);
+        expect(cb).toHaveBeenCalledWith(obj);
+      });
+
+      test("doesn't duplicate subscriptions", async () => {
+        // eslint-disable-next-line no-unused-vars
+        const client = new Connector(`ws://foo:1234`);
+        await server.connected;
+        const params = { channel: 'bar', args: ['baz'], id: 'id' };
+        const cb = jest.fn();
+        const errorCb = jest.fn();
+        client.subscribe(params, cb, errorCb, true);
+        client.subscribe(params, cb, errorCb, true);
+        expect(client.subscriptions.length).toBe(1);
+
+        const obj = { source: 'bar baz', client_reference: 'id' };
+        server.send(JSON.stringify(obj));
+
+        expect(cb).toHaveBeenCalledTimes(1);
+        expect(cb).toHaveBeenCalledWith(obj);
+      });
+
+      test('send GET and SUB requests.', async () => {
+        // eslint-disable-next-line no-unused-vars
+        const client = new Connector(`ws://foo:1234`);
+        client.send = jest.fn();
+        const params = { channel: 'bar', args: ['baz'], id: 'id' };
+        const cb = jest.fn();
+        const errorCb = jest.fn();
+        client.subscribe(params, cb, errorCb);
+        expect(client.send).toHaveBeenCalledTimes(2);
+        expect(client.send).toHaveBeenCalledWith('GET bar baz id');
+        expect(client.send).toHaveBeenCalledWith('SUB bar baz id');
+        client.send.mockRestore();
+      });
+
+      test('should register callback without sending GET and SUB requests (quiet=true).', async () => {
+        // eslint-disable-next-line no-unused-vars
+        const client = new Connector(`ws://foo:1234`);
+        await server.connected;
+        const params = { channel: 'bar', args: ['baz'], id: 'id' };
+        const cb = jest.fn();
+        const errorCb = jest.fn();
+        client.send = jest.fn();
+        client.subscribe(params, cb, errorCb, true);
+        expect(client.subscriptions.length).toBe(1);
+        expect(client.subscriptions[0].params).toBe(params);
+        expect(client.subscriptions[0].cb).toBe(cb);
+        expect(client.subscriptions[0].errorCb).toBe(errorCb);
+        expect(client.subscriptions[0].quiet).toBe(true);
+        expect(client.send).toBeCalledTimes(0);
+        client.send.mockRestore();
+      });
     });
 
     describe('#unsubscribe', () => {
-      test('should only unsubscribe the subscription using the good cb', () => {
+      test('should only unsubscribe the subscription using the good cb', async () => {
         // eslint-disable-next-line no-unused-vars
         const client = new Connector(`ws://foo:1234`);
-        const params = { channel: 'foo' };
+        await server.connected;
+        const params = { channel: 'foo', id: 'id' };
         const cb = jest.fn();
         const cb2 = jest.fn();
         client.subscribe(params, cb);
@@ -50,6 +113,12 @@ describe('WebSocketConnector', () => {
 
         client.unsubscribe('foo', cb);
         expect(client.subscriptions.length).toBe(1);
+
+        const obj = { source: 'foo', client_reference: 'id' };
+        server.send(JSON.stringify(obj));
+
+        expect(cb).toHaveBeenCalledTimes(0);
+        expect(cb2).toHaveBeenCalledTimes(1);
       });
 
       test('should unsubscribe all subscriptions related to a channel', () => {
@@ -75,46 +144,37 @@ describe('WebSocketConnector', () => {
         expect(client.subscriptions[0].params).toBe(params2);
         expect(client.subscriptions[0].cb).toBe(cb2);
       });
-    });
 
-    describe('#setBbox', () => {
-      test.only('should remove subscriptions before re adding it ', () => {
+      test('send DEL when there is no more unquiet subscriptions on the channel', () => {
         // eslint-disable-next-line no-unused-vars
         const client = new Connector(`ws://foo:1234`);
+        client.send = jest.fn();
         client.websocket.removeEventListener = jest.fn();
         client.websocket.addEventListener = jest.fn();
-        client.send = jest.fn();
         const params = { channel: 'foo' };
-        const params2 = { channel: 'bar' };
         const cb = jest.fn();
-        const cb2 = jest.fn();
-        client.subscribe(params, cb);
         client.subscribe(params, cb);
-        client.subscribe(params, cb);
-        client.subscribe(params, cb2);
-        client.subscribe(params2, cb2);
-        expect(client.subscriptions.length).toBe(3);
-        expect(client.websocket.removeEventListener).toBeCalledTimes(2);
-        expect(client.websocket.addEventListener).toBeCalledTimes(5);
-
-        client.websocket.removeEventListener.mockReset();
-        client.websocket.addEventListener.mockReset();
+        expect(client.send).toHaveBeenCalledWith('GET foo');
+        expect(client.send).toHaveBeenCalledWith('SUB foo');
 
-        client.setBbox([0, 0, 0, 0]);
+        client.unsubscribe('foo');
+        expect(client.send).toHaveBeenCalledWith('DEL foo');
+      });
 
-        expect(client.subscriptions.length).toBe(3);
-        expect(client.websocket.removeEventListener).toBeCalledTimes(3);
-        expect(client.websocket.addEventListener).toBeCalledTimes(3);
+      test("doesn't send DEL when we unsubscribe a quiet channel", () => {
+        // eslint-disable-next-line no-unused-vars
+        const client = new Connector(`ws://foo:1234`);
+        client.send = jest.fn();
+        client.websocket.removeEventListener = jest.fn();
+        client.websocket.addEventListener = jest.fn();
+        const params = { channel: 'foo' };
+        const cb = jest.fn();
+        client.subscribe(params, cb, null, true);
+        expect(cb).toHaveBeenCalledTimes(0);
 
         client.unsubscribe('foo');
-        expect(client.subscriptions.length).toBe(1);
-        expect(client.subscriptions[0].params).toBe(params2);
-        expect(client.subscriptions[0].cb).toBe(cb2);
-        client.unsubscribe('bar');
-        expect(client.subscriptions.length).toBe(0);
+        expect(cb).toHaveBeenCalledTimes(0);
         client.send.mockRestore();
-        client.websocket.removeEventListener.mockRestore();
-        client.websocket.addEventListener.mockRestore();
       });
     });
   });

package/common/layers/Layer.js

@@ -13,7 +13,9 @@ import { v4 as uuid } from 'uuid';
  * @classproperty {string} key - Identifier of the layer. Must be unique.
  * @classproperty {string[]} copyrights - Array of copyrights.
  * @classproperty {boolean} isBaseLayer - Define if the layer is a base layer. Read-only.
- * @classproperty {boolean} isQueryable - Define if the layer can be queried. Read-only.
+ * @classproperty {boolean} isQueryable - Define if the layer can be queried. If false, it will set isHoverActive and isClickActive to false. Read-only.
+ * @classproperty {boolean} isClickActive - If true feature information will be queried on user click event. See inherited layers for more informations. Read-only.
+ * @classproperty {boolean} isHoverActive - If true feature information will be queried on pointer move event. See inherited layers for more informations. Read-only.
  * @classproperty {boolean} isReactSpatialLayer - Custom property for duck typing since `instanceof` is not working when the instance was created on different bundles. Read-only.
  * @classproperty {Layer[]} children - List of children.
  * @classproperty {boolean} visible - Define if the layer is visible or not.
@@ -33,9 +35,9 @@ export default class Layer extends Observable {
    * @param {Object} [options.properties={}] Application-specific layer properties.
    * @param {boolean} [options.visible=true] If true this layer is visible on the map.
    * @param {boolean} [options.isBaseLayer=false] If true this layer is a baseLayer.
-   * @param {boolean} [options.isQueryable=true] If true this layer can be queried.
-   * @param {boolean} [options.isClickActive=true] If true feature information will be queried on click event. See inherited layers for more informations.
-   * @param {boolean} [options.isHoverActive=true] If true feature information will be queried on pointer move event. See inherited layers for more informations.
+   * @param {boolean} [options.isQueryable=true] Define if the layer can be queried. If false, it will also set isHoverActive and isClickActive to false. Read-only.
+   * @param {boolean} [options.isClickActive=true] If true feature information will be queried on click event. See inherited layers for more informations. Read-only.
+   * @param {boolean} [options.isHoverActive=true] If true feature information will be queried on pointer move event. See inherited layers for more informations. Read-only.
    * @param {number} [options.hitTolerance=5] Hit-detection tolerance in css pixels. Pixels inside the radius around the given position will be checked for features.
    */
   constructor(options = {}) {
@@ -109,10 +111,10 @@ export default class Layer extends Observable {
         value: !!isQueryable,
       },
       isClickActive: {
-        value: !!isClickActive,
+        value: !!isQueryable && !!isClickActive,
       },
       isHoverActive: {
-        value: !!isHoverActive,
+        value: !!isQueryable && !!isHoverActive,
       },
       hitTolerance: {
         value: hitTolerance || 5,
@@ -307,6 +309,7 @@ export default class Layer extends Observable {
     // eslint-disable-next-line no-console
     console.error(
       'getFeatureInfoAtCoordinate must be implemented by inheriting layers',
+      this.key,
     );
 
     // This layer returns no feature info.
@@ -427,7 +430,7 @@ export default class Layer extends Observable {
       .then((featureInfo) => {
         const { features, layer, coordinate } = featureInfo;
         this.hoverCallbacks.forEach((callback) =>
-          callback({ features, layer, coordinate }),
+          callback(features, layer, coordinate),
         );
         return featureInfo;
       })

package/common/layers/Layer.test.js

@@ -63,6 +63,21 @@ describe('Layer', () => {
     expect(layer.name).toEqual('Layer');
   });
 
+  test('should set isClickActive and isHoverActive to false if isQueryable is set to false.', () => {
+    const options = {
+      name: 'Layer',
+      isQueryable: false,
+      isClickActive: true,
+      isHoverActive: true,
+      olLayer,
+    };
+    const layer = new Layer(options);
+    expect(layer).toBeInstanceOf(Layer);
+    expect(layer.isQueryable).toBe(false);
+    expect(layer.isClickActive).toBe(false);
+    expect(layer.isHoverActive).toBe(false);
+  });
+
   test('should called terminate on initialization.', () => {
     const layer = new Layer({ name: 'Layer', olLayer });
     const spy = jest.spyOn(layer, 'terminate');
@@ -465,7 +480,13 @@ describe('Layer', () => {
         expect(spy).toHaveBeenCalledWith(evt.coordinate);
         expect(featureInfo).toBe(goodFeatureInfo);
         expect(fn).toHaveBeenCalledTimes(1);
+        expect(fn.mock.calls[0][0]).toBe(goodFeatureInfo.features);
+        expect(fn.mock.calls[0][1]).toBe(goodFeatureInfo.layer);
+        expect(fn.mock.calls[0][2]).toBe(goodFeatureInfo.coordinate);
         expect(fn2).toHaveBeenCalledTimes(1);
+        expect(fn2.mock.calls[0][0]).toBe(goodFeatureInfo.features);
+        expect(fn2.mock.calls[0][1]).toBe(goodFeatureInfo.layer);
+        expect(fn2.mock.calls[0][2]).toBe(goodFeatureInfo.coordinate);
         done();
       });
     });
@@ -599,7 +620,13 @@ describe('Layer', () => {
         expect(spy).toHaveBeenCalledWith(evt.coordinate);
         expect(featureInfo).toBe(goodFeatureInfo);
         expect(fn).toHaveBeenCalledTimes(1);
+        expect(fn.mock.calls[0][0]).toBe(goodFeatureInfo.features);
+        expect(fn.mock.calls[0][1]).toBe(goodFeatureInfo.layer);
+        expect(fn.mock.calls[0][2]).toBe(goodFeatureInfo.coordinate);
         expect(fn2).toHaveBeenCalledTimes(1);
+        expect(fn2.mock.calls[0][0]).toBe(goodFeatureInfo.features);
+        expect(fn2.mock.calls[0][1]).toBe(goodFeatureInfo.layer);
+        expect(fn2.mock.calls[0][2]).toBe(goodFeatureInfo.coordinate);
         done();
       });
     });