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

package/api/tralis/TralisAPI.js

@@ -75,12 +75,17 @@ class TralisAPI {
     /** @ignore */
     this.prefix = options.prefix || '';
 
+    this.isUpdateBboxOnMoveEnd = options.isUpateBboxOnMoveEnd || false;
+
     /** @ignore */
     this.conn = new WebSocketConnector(wsUrl);
-    this.conn.setProjection(options.projection || 'epsg:3857');
 
-    if (options.bbox) {
-      this.conn.setBbox(options.bbox);
+    if (!this.isUpdateBboxOnMoveEnd) {
+      this.conn.setProjection(options.projection || 'epsg:3857');
+
+      if (options.bbox) {
+        this.conn.setBbox(options.bbox);
+      }
     }
   }
 
@@ -377,7 +382,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,
+    );
   }
 
   /**

package/api/tralis/WebSocketConnector.js

@@ -48,17 +48,17 @@ class WebSocketConnector {
     /** @ignore */
     this.websocket = new WebSocket(url);
 
-    if (this.currentProj) {
-      this.setProjection(this.currentProj);
-    }
+    // 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, s.quiet);
+    // });
 
-    [...this.subscriptions].forEach((s) => {
-      this.subscribe(s.params, s.cb, s.errorCb, true);
-    });
+    // if (this.currentBbox) {
+    //   this.setBbox(this.currentBbox);
+    // }
 
     // reconnect on close
     this.websocket.onclose = () => {
@@ -123,10 +123,11 @@ class WebSocketConnector {
      * @type {Array<Array<number>>}
      */
     this.currentBbox = coordinates;
+
     this.send(`BBOX ${coordinates.join(' ')}`);
-    this.subscriptions.forEach((s) => {
-      this.get(s.params, s.cb, s.errorCb);
-    });
+    // this.subscriptions.forEach((s) => {
+    //   this.get(s.params, s.cb, s.errorCb);
+    // });
   }
 
   /**
@@ -184,27 +185,27 @@ class WebSocketConnector {
    * @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.
    */
-  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;
     }
   }

package/api/tralis/WebSocketConnector.test.js

@@ -103,8 +103,8 @@ describe('WebSocketConnector', () => {
         client.setBbox([0, 0, 0, 0]);
 
         expect(client.subscriptions.length).toBe(3);
-        expect(client.websocket.removeEventListener).toBeCalledTimes(3);
-        expect(client.websocket.addEventListener).toBeCalledTimes(3);
+        expect(client.websocket.removeEventListener).toBeCalledTimes(0);
+        expect(client.websocket.addEventListener).toBeCalledTimes(0);
 
         client.unsubscribe('foo');
         expect(client.subscriptions.length).toBe(1);

package/common/mixins/TrackerLayerMixin.js

@@ -44,10 +44,8 @@ export class TrackerLayerInterface {
   /**
    * Start the timeout for the next update.
    * @private
-   * @param {number} zoom
    */
-  // eslint-disable-next-line no-unused-vars
-  startUpdateTime(zoom) {}
+  startUpdateTime() {}
 
   /**
    * Stop the clock.
@@ -426,6 +424,9 @@ const TrackerLayerMixin = (Base) =>
       }
     }
 
+    /**
+     * 
+
     /**
      * Launch renderTrajectories. it avoids duplicating code in renderTrajectories method.
      *
@@ -547,9 +548,21 @@ const TrackerLayerMixin = (Base) =>
       });
     }
 
+    /**
+     * On zoomend we adjust the time interval of the update of vehicles positions.
+     *
+     * @param evt Event that triggered the function.
+     * @private
+     */
+    // eslint-disable-next-line no-unused-vars
+    onZoomEnd(evt) {
+      this.startUpdateTime();
+    }
+
     /**
      * Define beahvior when a vehicle is clicked
      * To be defined in child classes.
+     *
      * @private
      * @override
      */
@@ -558,6 +571,7 @@ const TrackerLayerMixin = (Base) =>
     /**
      * Define behavior when a vehicle is hovered
      * To be defined in child classes.
+     *
      * @private
      * @override
      */
@@ -565,6 +579,7 @@ const TrackerLayerMixin = (Base) =>
 
     /**
      * Get the duration before the next update depending on zoom level.
+     *
      * @private
      * @param {number} zoom
      */
@@ -572,6 +587,7 @@ const TrackerLayerMixin = (Base) =>
       const roundedZoom = Math.round(zoom);
       const timeStep = timeSteps[roundedZoom] || 25;
       const nextTick = Math.max(25, timeStep / this.speed);
+      console.log(`Next render in ${nextTick} ms.`);
       return nextTick;
     }
 

package/common/mixins/TralisLayerMixin.js

@@ -91,11 +91,14 @@ const TralisLayerMixin = (TrackerLayer) =>
       super({ ...options });
       this.debug = options.debug;
       this.mode = options.mode || TralisModes.TOPOGRAPHIC;
-      this.refreshTimeInMs = 1000 / 30;
       this.onMessage = this.onMessage.bind(this);
       this.onDeleteMessage = this.onDeleteMessage.bind(this);
       this.api = options.api || new TralisAPI(options);
+
       this.format = new GeoJSON();
+
+      // This property will call api.setBbox on each movend event
+      this.isUpdateBboxOnMoveEnd = options.isUpdateBboxOnMoveEnd || false;
     }
 
     start() {
@@ -212,7 +215,7 @@ const TralisLayerMixin = (TrackerLayer) =>
         }
       }
 
-      this.updateTrajectories();
+      this.tracker.setTrajectories(this.trajectories);
     }
 
     removeTrajectory(id) {
@@ -232,15 +235,6 @@ const TralisLayerMixin = (TrackerLayer) =>
         }
       }
     }
-
-    updateTrajectories() {
-      this.tracker.setTrajectories(this.trajectories);
-      this.renderTrajectories();
-    }
-
-    getRefreshTimeInMs() {
-      return this.refreshTimeInMs;
-    }
   };
 
 export default TralisLayerMixin;