mobility-toolbox-js 2.0.0-beta.1 → 2.0.0

package/common/styles/trackerDelayStyle.js

@@ -0,0 +1,17 @@
+import trackerDefaultStyle from './trackerDefaultStyle';
+
+/**
+ * A tracker style that display the delay as backgroundColor.
+ *
+ * @param {*} trajectory The trajectory to render.
+ * @param {*} viewState The view state of the map.
+ * @param {*} options Some options to change the rendering
+ * @return a canvas
+ */
+const style = (trajectory, viewState, options) => {
+  return trackerDefaultStyle(trajectory, viewState, {
+    ...options,
+    useDelayStyle: true,
+  });
+};
+export default style;

package/common/styles/trackerSimpleStyle.js

@@ -0,0 +1,22 @@
+/**
+ * A very simple tracker style.
+ * Display blue point for each train.
+ */
+let canvas;
+const style = () => {
+  if (!canvas) {
+    document.createElement('canvas');
+    canvas.width = 15;
+    canvas.height = 15;
+    const ctx = canvas.getContext('2d');
+    ctx.arc(8, 8, 5, 0, 2 * Math.PI, false);
+    ctx.fillStyle = '#8ED6FF';
+    ctx.fill();
+    ctx.lineWidth = 3;
+    ctx.strokeStyle = 'black';
+    ctx.stroke();
+    ctx.lineWidth = 3;
+  }
+  return canvas;
+};
+export default style;

package/common/trackerConfig.test.js

@@ -10,19 +10,6 @@ describe('trackerConfig', () => {
       expect(getTypeIndex(undefined)).toBe(undefined);
     });
 
-    test('find good index for old trajserv values', () => {
-      expect(getTypeIndex('Tram')).toBe(0);
-      expect(getTypeIndex('Subway / Metro / S-Bahn')).toBe(1);
-      expect(getTypeIndex('Train')).toBe(2);
-      expect(getTypeIndex('Bus')).toBe(3);
-      expect(getTypeIndex('Ferry')).toBe(4);
-      expect(getTypeIndex('Cable Car')).toBe(5);
-      expect(getTypeIndex('Gondola')).toBe(6);
-      expect(getTypeIndex('Funicular')).toBe(7);
-      expect(getTypeIndex('Long distance bus')).toBe(8);
-      expect(getTypeIndex('Rail')).toBe(9);
-    });
-
     test('find good index for new tracker values', () => {
       expect(getTypeIndex('tram')).toBe(0);
       expect(getTypeIndex('subway')).toBe(1);

package/common/utils/getMapboxMapCopyrights.js

@@ -11,6 +11,7 @@ const getMapboxMapCopyrights = (map) => {
   }
   const { sourceCaches } = map.style;
   let copyrights = [];
+
   Object.values(sourceCaches).forEach((sourceCache) => {
     if (sourceCache.used) {
       const source = sourceCache.getSource();

package/common/utils/index.js

@@ -1,7 +1,6 @@
 export { default as getMapboxStyleUrl } from './getMapboxStyleUrl';
 export { default as getMapboxMapCopyrights } from './getMapboxMapCopyrights';
 export { default as removeDuplicate } from './removeDuplicate';
-export { default as delayTrackerStyle } from './delayTrackerStyle';
-export * from './delayTrackerStyle';
-export { default as simpleTrackerStyle } from './simpleTrackerStyle';
 export * from './timeUtils';
+export * from '../styles';
+export { default as sortByDelay } from './sortByDelay';

package/common/utils/sortByDelay.js

@@ -0,0 +1,23 @@
+const sortByDelay = (traj1, traj2) => {
+  const props1 = traj1.properties;
+  const props2 = traj2.properties;
+
+  if (props1.delay === null && props2.delay !== null) {
+    return 1;
+  }
+  if (props2.delay === null && props1.delay !== null) {
+    return -1;
+  }
+
+  // We put cancelled train inbetween green and yellow trains
+  // >=180000ms corresponds to yellow train
+  if (props1.cancelled && !props2.cancelled) {
+    return props2.delay < 180000 ? -1 : 1;
+  }
+  if (props2.cancelled && !props1.cancelled) {
+    return props1.delay < 180000 ? 1 : -1;
+  }
+  return props2.delay - props1.delay;
+};
+
+export default sortByDelay;