mobility-toolbox-js 1.4.1-beta.2 → 1.4.4

package/api/tralis/TralisAPI.js

@@ -491,8 +491,15 @@ class TralisAPI {
       this.conn.get(
         params,
         (data) => {
-          // Remove the delay from arrivalTime nnd departureTime
-          resolve(cleanStopTime(data.content && data.content[0]));
+          if (data.content && data.content.length) {
+            const content = data.content.map((stopSequence) => {
+              return cleanStopTime(stopSequence);
+            });
+
+            // Remove the delay from arrivalTime and departureTime
+            resolve(content);
+          }
+          resolve([]);
         },
         (err) => {
           reject(err);
@@ -527,8 +534,14 @@ class TralisAPI {
     this.subscribe(
       `stopsequence_${id}`,
       (data) => {
-        // Remove the delay from arrivalTime nad departureTime
-        onMessage(cleanStopTime(data.content && data.content[0]));
+        if (data.content && data.content.length) {
+          const content = data.content.map((stopSequence) => {
+            return cleanStopTime(stopSequence);
+          });
+
+          // Remove the delay from arrivalTime and departureTime
+          onMessage(content);
+        }
       },
       (err) => {
         // eslint-disable-next-line no-console

package/common/mixins/TrackerLayerMixin.js

@@ -422,20 +422,6 @@ const TrackerLayerMixin = (Base) =>
 
       const renderTime = this.live ? Date.now() : this.time;
 
-      // Avoid useless render before the next tick.
-      if (
-        this.live &&
-        resolution === this.lastRenderResolution &&
-        rotation === this.lastRenderRotation &&
-        renderTime - this.lastRenderTime < this.updateTimeDelay
-      ) {
-        return;
-      }
-
-      this.lastRenderTime = renderTime;
-      this.lastRenderResolution = resolution;
-      this.lastRenderRotation = rotation;
-
       this.tracker.renderTrajectories(
         renderTime,
         size,

package/common/mixins/TrajservLayerMixin.js

@@ -432,22 +432,29 @@ const TrajservLayerMixin = (TrackerLayer) =>
       const z = Math.min(Math.floor(zoom || 1), 16);
       const hover = this.hoverVehicleId === id;
       const selected = this.selectedVehicleId === id;
-      const key = `${z}${type}${name}${operatorProvidesRealtime}${delay}${hover}${selected}${cancelled}`;
+      let key = `${z}${type}${name}${operatorProvidesRealtime}${delay}${hover}${selected}${cancelled}`;
+
+      // Calcul the radius of the circle
+      let radius = getRadius(type, z) * this.pixelRatio;
+      const isDisplayStrokeAndDelay = radius >= 7 * this.pixelRatio;
+      if (hover || selected) {
+        radius = isDisplayStrokeAndDelay
+          ? radius + 5 * this.pixelRatio
+          : 14 * this.pixelRatio;
+      }
+      const mustDrawText = radius > 10 * this.pixelRatio;
 
-      if (!this.styleCache[key]) {
-        let radius = getRadius(type, z) * this.pixelRatio;
-        const isDisplayStrokeAndDelay = radius >= 7 * this.pixelRatio;
+      // Optimize the cache key, very important in high zoom level
+      if (!mustDrawText) {
+        key = `${z}${type}${color}${operatorProvidesRealtime}${delay}${hover}${selected}${cancelled}`;
+      }
 
+      if (!this.styleCache[key]) {
         if (radius === 0) {
           this.styleCache[key] = null;
           return null;
         }
 
-        if (hover || selected) {
-          radius = isDisplayStrokeAndDelay
-            ? radius + 5 * this.pixelRatio
-            : 14 * this.pixelRatio;
-        }
         const margin = 1 * this.pixelRatio;
         const radiusDelay = radius + 2;
         const markerSize = radius * 2;
@@ -525,8 +532,8 @@ const TrajservLayerMixin = (TrackerLayer) =>
         ctx.restore();
 
         // Draw text in the circle
-        if (radius > 10) {
-          const fontSize = Math.max(radius, 10);
+        if (mustDrawText) {
+          const fontSize = Math.max(radius, 10 * this.pixelRatio);
           const textSize = getTextSize(ctx, markerSize, name, fontSize);
 
           // Draw a stroke to the text only if a provider provides realtime but we don't use it.