mobility-toolbox-js 2.0.0-beta.60 → 2.0.0-beta.62

package/common/styles/realtimeDefaultStyle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"realtimeDefaultStyle.d.ts","sourceRoot":"","sources":["../../../src/common/styles/realtimeDefaultStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKV,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAMrB;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,WACnB,MAAM,UACN,MAAM,SACP,MAAM,2CAmBd,CAAC;AAKF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,UACtB,MAAM,QACP,MAAM,YACF,MAAM,QACV,MAAM,cACA,MAAM,sBACC,MAAM,eACb,MAAM,2CAuBnB,CAAC;AAKF;;;;GAIG;AACH,eAAO,MAAM,eAAe,WAClB,MAAM,UACN,MAAM,SACP,MAAM,aACF,OAAO,WACT,OAAO,cACJ,MAAM,2CAiCnB,CAAC;AAKF;;;;GAIG;AACH,eAAO,MAAM,aAAa,SAClB,MAAM,UACJ,MAAM,YACJ,MAAM,aACL,MAAM,eACJ,MAAM,aACR,OAAO,cACN,MAAM,2CAmCnB,CAAC;AAKF;;;;;;;GAOG;AACH,QAAA,MAAM,oBAAoB,EAAE,qBA8M3B,CAAC;AACF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"realtimeDefaultStyle.d.ts","sourceRoot":"","sources":["../../../src/common/styles/realtimeDefaultStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAKV,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAMrB;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,WACnB,MAAM,UACN,MAAM,SACP,MAAM,2CAmBd,CAAC;AAKF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,UACtB,MAAM,QACP,MAAM,YACF,MAAM,QACV,MAAM,cACA,MAAM,sBACC,MAAM,eACb,MAAM,2CAuBnB,CAAC;AAKF;;;;GAIG;AACH,eAAO,MAAM,eAAe,WAClB,MAAM,UACN,MAAM,SACP,MAAM,aACF,OAAO,WACT,OAAO,cACJ,MAAM,2CAiCnB,CAAC;AAKF;;;;GAIG;AACH,eAAO,MAAM,aAAa,SAClB,MAAM,UACJ,MAAM,YACJ,MAAM,aACL,MAAM,eACJ,MAAM,aACR,OAAO,cACN,MAAM,2CAmCnB,CAAC;AAKF;;;;;;;GAOG;AACH,QAAA,MAAM,oBAAoB,EAAE,qBAiN3B,CAAC;AACF,eAAe,oBAAoB,CAAC"}

package/common/styles/realtimeDefaultStyle.js

@@ -140,7 +140,7 @@ const cache = {};
  * @return a canvas
  */
 const realtimeDefaultStyle = (trajectory, viewState, options) => {
-    const { hoverVehicleId, selectedVehicleId, useDelayStyle, delayOutlineColor = '#000', delayDisplay = 300000, getRadius = () => 0, getBgColor = () => '#000', getDelayColor = () => '#000', getDelayText = () => null, getTextColor = () => '#000', getTextSize = () => 0, } = options;
+    const { hoverVehicleId, selectedVehicleId, useDelayStyle, delayOutlineColor = '#000', delayDisplay = 300000, getRadius = () => 0, getBgColor = () => '#000', getDelayColor = () => '#000', getDelayText = () => null, getTextColor = () => '#000', getTextSize = () => 0, getMaxRadiusForText = () => 10, getMaxRadiusForStrokeAndDelay = () => 7, } = options;
     const { zoom, pixelRatio = 1 } = viewState;
     let { type } = trajectory.properties;
     const { train_id: id, line, delay, state, operator_provides_realtime_journey: operatorProvidesRealtime, } = trajectory.properties;
@@ -166,13 +166,13 @@ const realtimeDefaultStyle = (trajectory, viewState, options) => {
     const selected = !!(selectedVehicleId && selectedVehicleId === id);
     // Calcul the radius of the circle
     let radius = getRadius(type, z) * pixelRatio;
-    const isDisplayStrokeAndDelay = radius >= 7 * pixelRatio;
+    const isDisplayStrokeAndDelay = radius >= getMaxRadiusForStrokeAndDelay() * pixelRatio;
     if (hover || selected) {
         radius = isDisplayStrokeAndDelay
             ? radius + 5 * pixelRatio
             : 14 * pixelRatio;
     }
-    const mustDrawText = radius > 10 * pixelRatio;
+    const isDisplayText = radius > getMaxRadiusForText() * pixelRatio;
     // Optimize the cache key, very important in high zoom level
     let key = `${radius}${hover}${selected}${cancelled}${delay}`;
     if (useDelayStyle) {
@@ -181,7 +181,7 @@ const realtimeDefaultStyle = (trajectory, viewState, options) => {
     else {
         key += `${type}${color}`;
     }
-    if (mustDrawText) {
+    if (isDisplayText) {
         key += `${name}${textColor}`;
     }
     if (!cache[key]) {
@@ -239,7 +239,7 @@ const realtimeDefaultStyle = (trajectory, viewState, options) => {
                 ctx.drawImage(circle, 0, 0);
             }
             // Draw text in the circle
-            if (mustDrawText && ctx) {
+            if (isDisplayText && ctx) {
                 const fontSize = Math.max(radius, 10);
                 const textSize = getTextSize(ctx, markerSize, name, fontSize);
                 const textColor2 = !useDelayStyle

package/mbt.js

@@ -36187,7 +36187,9 @@ uniform ${i3} ${o3} u_${a3};
       getDelayColor: getDelayColor2 = () => "#000",
       getDelayText: getDelayText2 = () => null,
       getTextColor: getTextColor2 = () => "#000",
-      getTextSize: getTextSize2 = () => 0
+      getTextSize: getTextSize2 = () => 0,
+      getMaxRadiusForText = () => 10,
+      getMaxRadiusForStrokeAndDelay = () => 7
     } = options;
     const { zoom, pixelRatio = 1 } = viewState;
     let { type } = trajectory.properties;
@@ -36219,18 +36221,18 @@ uniform ${i3} ${o3} u_${a3};
     const hover = !!(hoverVehicleId && hoverVehicleId === id);
     const selected = !!(selectedVehicleId && selectedVehicleId === id);
     let radius = getRadius2(type, z) * pixelRatio;
-    const isDisplayStrokeAndDelay = radius >= 7 * pixelRatio;
+    const isDisplayStrokeAndDelay = radius >= getMaxRadiusForStrokeAndDelay() * pixelRatio;
     if (hover || selected) {
       radius = isDisplayStrokeAndDelay ? radius + 5 * pixelRatio : 14 * pixelRatio;
     }
-    const mustDrawText = radius > 10 * pixelRatio;
+    const isDisplayText = radius > getMaxRadiusForText() * pixelRatio;
     let key = `${radius}${hover}${selected}${cancelled}${delay}`;
     if (useDelayStyle) {
       key += `${operatorProvidesRealtime}`;
     } else {
       key += `${type}${color}`;
     }
-    if (mustDrawText) {
+    if (isDisplayText) {
       key += `${name}${textColor}`;
     }
     if (!cache2[key]) {
@@ -36277,7 +36279,7 @@ uniform ${i3} ${o3} u_${a3};
         if (circle) {
           ctx.drawImage(circle, 0, 0);
         }
-        if (mustDrawText && ctx) {
+        if (isDisplayText && ctx) {
           const fontSize = Math.max(radius, 10);
           const textSize = getTextSize2(ctx, markerSize, name, fontSize);
           const textColor2 = !useDelayStyle ? textColor || getTextColor2(type) : "#000000";