diff options
| author | Anton Tananaev <anton@traccar.org> | 2022-07-05 17:48:00 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2022-07-05 17:48:00 -0700 |
| commit | 89928e3a9a9356b96c2d02c9682161295ad73641 (patch) | |
| tree | b3d250a62a39fe196409fabbcda1058cb15fc375 /modern/src/map | |
| parent | 834d57c9eb14fff48f4444af198f0a10ab1b72a2 (diff) | |
| download | trackermap-web-89928e3a9a9356b96c2d02c9682161295ad73641.tar.gz trackermap-web-89928e3a9a9356b96c2d02c9682161295ad73641.tar.bz2 trackermap-web-89928e3a9a9356b96c2d02c9682161295ad73641.zip | |
Support position color (fix #805)
Diffstat (limited to 'modern/src/map')
| -rw-r--r-- | modern/src/map/MapPositions.js | 2 | ||||
| -rw-r--r-- | modern/src/map/core/preloadImages.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modern/src/map/MapPositions.js b/modern/src/map/MapPositions.js index 070ec0c8..89a48df1 100644 --- a/modern/src/map/MapPositions.js +++ b/modern/src/map/MapPositions.js @@ -20,7 +20,7 @@ const MapPositions = ({ positions, onClick, showStatus }) => { deviceId: position.deviceId, name: device.name, category: device.category || 'default', - color: showStatus ? getStatusColor(device.status) : 'neutral', + color: showStatus ? position.attributes.color || getStatusColor(device.status) : 'neutral', }; }; diff --git a/modern/src/map/core/preloadImages.js b/modern/src/map/core/preloadImages.js index c66ec5de..8649a347 100644 --- a/modern/src/map/core/preloadImages.js +++ b/modern/src/map/core/preloadImages.js @@ -57,7 +57,7 @@ export default async () => { mapImages.direction = await prepareIcon(await loadImage(directionSvg)); await Promise.all(Object.keys(mapIcons).map(async (category) => { const results = []; - ['positive', 'negative', 'neutral'].forEach((color) => { + ['primary', 'positive', 'negative', 'neutral'].forEach((color) => { results.push(loadImage(mapIcons[category]).then((icon) => { mapImages[`${category}-${color}`] = prepareIcon(background, icon, palette.colors[color]); })); |