From 5f1de2f30ffcc80c75a4a3256340a56d822dc1fa Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Fri, 27 May 2022 09:15:49 -0700
Subject: Better map icon handling

---
 modern/src/main/DevicesList.js | 4 ++--
 modern/src/main/StatusCard.js  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'modern/src/main')

diff --git a/modern/src/main/DevicesList.js b/modern/src/main/DevicesList.js
index 022da390..108c3397 100644
--- a/modern/src/main/DevicesList.js
+++ b/modern/src/main/DevicesList.js
@@ -18,7 +18,6 @@ import BatteryCharging20Icon from '@mui/icons-material/BatteryCharging20';
 import FlashOnIcon from '@mui/icons-material/FlashOn';
 import FlashOffIcon from '@mui/icons-material/FlashOff';
 import ErrorIcon from '@mui/icons-material/Error';
-
 import moment from 'moment';
 import { devicesActions } from '../store';
 import { useEffectAsync } from '../reactHelper';
@@ -26,6 +25,7 @@ import {
   formatAlarm, formatBoolean, formatPercentage, formatStatus, getStatusColor,
 } from '../common/util/formatter';
 import { useTranslation } from '../common/components/LocalizationProvider';
+import { mapIcons } from '../map/core/preloadImages';
 
 const useStyles = makeStyles((theme) => ({
   list: {
@@ -86,7 +86,7 @@ const DeviceRow = ({ data, index, style }) => {
       <ListItem button key={item.id} className={classes.listItem} onClick={() => dispatch(devicesActions.select(item.id))}>
         <ListItemAvatar>
           <Avatar>
-            <img className={classes.icon} src={`images/icon/${item.category || 'default'}.svg`} alt="" />
+            <img className={classes.icon} src={mapIcons[item.category || 'default']} alt="" />
           </Avatar>
         </ListItemAvatar>
         <ListItemText
diff --git a/modern/src/main/StatusCard.js b/modern/src/main/StatusCard.js
index d991bd6a..5a65f4c7 100644
--- a/modern/src/main/StatusCard.js
+++ b/modern/src/main/StatusCard.js
@@ -32,6 +32,7 @@ import usePersistedState from '../common/util/usePersistedState';
 import usePositionAttributes from '../common/attributes/usePositionAttributes';
 import { devicesActions } from '../store';
 import { useCatch } from '../reactHelper';
+import { mapIcons } from '../map/core/preloadImages';
 
 const useStyles = makeStyles((theme) => ({
   card: {
@@ -110,7 +111,7 @@ const StatusCard = ({ deviceId, onClose }) => {
           <CardHeader
             avatar={(
               <Avatar>
-                <img className={classes.icon} src={`images/icon/${device.category || 'default'}.svg`} alt="" />
+                <img className={classes.icon} src={mapIcons[device.category || 'default']} alt="" />
               </Avatar>
             )}
             action={(
-- 
cgit v1.2.3