fix: scan cells

WatWowMap · Mar 14, 2024 · b6b45ca · b6b45ca
1 parent 5b78be4
commit b6b45ca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/features/scanCell/ScanCellPopup.jsx b/src/features/scanCell/ScanCellPopup.jsx
@@ -1,7 +1,7 @@
 // @ts-check
 import * as React from 'react'
 import Typography from '@mui/material/Typography'
-import { Trans, useTranslation } from 'react-i18next'
+import { useTranslation } from 'react-i18next'
 
 import { ErrorBoundary } from '@components/ErrorBoundary'
 import { getTimeUntil } from '@utils/getTimeUntil'
@@ -27,7 +27,7 @@ export function ScanCellPopup({ id, updated }) {
   return (
     <ErrorBoundary noRefresh variant="h5">
       <Typography variant="h6" align="center">
-        <Trans i18nKey="s2_cell_level">{{ level: 15 }}</Trans>
+        {t('s2_cell_level', { level: 15 })}
       </Typography>
       <Typography variant="subtitle2" align="center">
         {timer.str.replace('days', t('days')).replace('day', t('day'))}

diff --git a/src/features/scanCell/ScanCellTile.jsx b/src/features/scanCell/ScanCellTile.jsx
@@ -12,7 +12,10 @@ import { scanCellMarker } from './scanCellMarker'
  * @returns
  */
 const BaseScanCellTile = (scanCell) => (
-  <Polygon positions={scanCell.polygon} {...scanCellMarker(scanCell.updated)}>
+  <Polygon
+    positions={scanCell.polygon}
+    {...scanCellMarker(Date.now() / 1000 - scanCell.updated)}
+  >
     <Popup position={[scanCell.center_lat, scanCell.center_lon]}>
       <ScanCellPopup {...scanCell} />
     </Popup>

diff --git a/src/features/scanCell/scanCellMarker.js b/src/features/scanCell/scanCellMarker.js
@@ -7,9 +7,8 @@
 export function scanCellMarker(ago) {
   const value = ago <= 1050 ? 0 : Math.min((ago - 1050) / 750, 1)
   const hue = ((1 - value) * 120).toString(10)
-
   return {
-    fillColor: ['hsl(', hue, ',100%, 50%)'].join(''),
+    fillColor: `hsl(${hue}, 100%, 50%)`,
     color: 'black',
     opacity: 0.75,
     fillOpacity: 0.5,