Fix Color normalization

traccar · Oct 7, 2024 · a421cfa · a421cfa
1 parent 10b8a91
commit a421cfa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/common/util/colors.js b/src/common/util/colors.js
@@ -22,9 +22,15 @@ const interpolateTurbo = (value) => {
   ];
 };
 
-const getSpeedColor = (speed, maxSpeed) => {
-  const normalizedSpeed = Math.max(0, Math.min(1, speed / maxSpeed));
+const getSpeedColor = (speed, minSpeed, maxSpeed) => {
+  if (maxSpeed <= minSpeed) {
+    throw new Error('maxSpeed must be greater than minSpeed');
+  }
+
+  const normalizedSpeed = (speed - minSpeed) / (maxSpeed - minSpeed);
+
   const [r, g, b] = interpolateTurbo(normalizedSpeed);
+
   return `rgb(${r}, ${g}, ${b})`;
 };
 

diff --git a/src/map/MapRoutePoints.js b/src/map/MapRoutePoints.js
@@ -57,7 +57,11 @@ const MapRoutePoints = ({ positions, onClick }) => {
   }, [onMarkerClick]);
 
   useEffect(() => {
+    if (positions.length === 0) return;
+
     const maxSpeed = positions.map((p) => p.speed).reduce((a, b) => Math.max(a, b), -Infinity);
+    const minSpeed = positions.map((p) => p.speed).reduce((a, b) => Math.min(a, b), Infinity);
+
     map.getSource(id)?.setData({
       type: 'FeatureCollection',
       features: positions.map((position, index) => ({
@@ -70,7 +74,7 @@ const MapRoutePoints = ({ positions, onClick }) => {
           index,
           id: position.id,
           rotation: position.course,
-          color: getSpeedColor(position.speed, maxSpeed),
+          color: getSpeedColor(position.speed, minSpeed, maxSpeed),
         },
       })),
     });