2 files changed, 16 insertions, 9 deletions
diff --git a/modern/src/map/PositionsMap.js b/modern/src/map/PositionsMap.js
index c5c3eee..5320158 100644
--- a/modern/src/map/PositionsMap.js
+++ b/modern/src/map/PositionsMap.js
@@ -35,6 +35,7 @@ const PositionsMap = ({ positions }) => {
   const createFeature = (devices, position) => {
     const device = devices[position.deviceId];
     return {
+      position: position,
       deviceId: position.deviceId,
       name: device.name,
       category: device.category || 'default',
@@ -52,16 +53,20 @@ const PositionsMap = ({ positions }) => {
       coordinates[0] += event.lngLat.lng > coordinates[0] ? 360 : -360;
     }
 
+    console.log(event);
+
+    const position = JSON.parse(feature.properties.position);
     const placeholder = document.createElement('div');
     ReactDOM.render(
       <Provider store={store}>
         <ThemeProvider theme={theme}>
-          <StatusView
-            deviceId={feature.properties.deviceId}
-            onShowDetails={(positionId) => history.push(`/position/${positionId}`)}
-            onShowHistory={() => history.push('/replay')}
-            onEditClick={(deviceId) => history.push(`/device/${deviceId}`)}
-            onCommandsClick={(deviceId) => history.push(`/device/${deviceId}/commands`) }
+            <StatusView
+              position={position}
+              deviceId={feature.properties.deviceId}
+              onShowDetails={(positionId) => history.push(`/position/${positionId}`)}
+              onShowHistory={() => history.push('/replay')}
+              onEditClick={(deviceId) => history.push(`/device/${deviceId}`)}
+              onCommandsClick={(deviceId) => history.push(`/device/${deviceId}/commands`) }
           />
         </ThemeProvider>
       </Provider>,
diff --git a/modern/src/map/StatusView.js b/modern/src/map/StatusView.js
index 6fb72c7..b451573 100644
--- a/modern/src/map/StatusView.js
+++ b/modern/src/map/StatusView.js
@@ -37,7 +37,7 @@ const useStyles = makeStyles((theme) => ({
 }));
 
 const StatusView = ({
-  deviceId, onShowDetails, onShowHistory, onEditClick, onCommandsClick,
+  position, deviceId, onShowDetails, onShowHistory, onEditClick, onCommandsClick,
 }) => {
   const classes = useStyles();
   const t = useTranslation();
@@ -45,7 +45,6 @@ const StatusView = ({
   const [removeDialogShown, setRemoveDialogShown] = useState(false);
   const session = useSelector((state) => state.session);
   const device = useSelector((state) => state.devices.items[deviceId]);
-  const position = useSelector(getPosition(deviceId));
 
   const distanceUnit = useAttributePreference('distanceUnit');
   const speedUnit = useAttributePreference('speedUnit');
@@ -90,7 +89,10 @@ const StatusView = ({
               <ListItem classes={{ container: classes.listItemContainer, root: classes.listItemRoot }}>
                 <ListItemText primary={t('positionSpeed')} secondary={formatSpeed(position.speed, speedUnit, t)} />
               </ListItem>
-              {position.attributes.hours && (
+              {device.category
+              && (device.category.toLowerCase() === 'backhoe' || device.category.toLowerCase() === 'tractor')
+              && position.attributes.hours
+              && (
                 <ListItem classes={{ container: classes.listItemContainer, root: classes.listItemRoot }}>
                   <ListItemText primary={t('positionHours')} secondary={formatHours(position.attributes.hours, t)} />
                 </ListItem>)}