Display features

6 files changed, 48 insertions, 26 deletions

diff --git a/modern/public/images/background.svg b/modern/public/images/background.svg
index df2204d9..3dcb6870 100644
--- a/modern/public/images/background.svg
+++ b/modern/public/images/background.svg
@@ -1,4 +1,4 @@
-<svg width="50px" height="50px" viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
+<svg width="48px" height="48px" viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
   <defs>
     <filter id="shadow">
       <feDropShadow dx="0" dy="0.1" stdDeviation="0.3" flood-color="grey"/>
diff --git a/modern/public/images/icon/marker.svg b/modern/public/images/icon/marker.svg
new file mode 100644
index 00000000..f626547c
--- /dev/null
+++ b/modern/public/images/icon/marker.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="24px" height="24px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000000"><path d="M 12 2.0097656 C 8.144 2.0097656 5.0078125 5.1479063 5.0078125 9.0039062 C 5.0078125 13.486906 10.974516 20.769172 11.228516 21.076172 L 12 22.011719 L 12.771484 21.076172 C 13.025484 20.768172 18.992188 13.486906 18.992188 9.0039062 C 18.992187 5.1469062 15.856 2.0097656 12 2.0097656 z M 12 4.0097656 C 14.753 4.0097656 16.992188 6.2509062 16.992188 9.0039062 C 16.992187 11.708906 13.878 16.361172 12 18.826172 C 10.122 16.363172 7.0078125 11.712906 7.0078125 9.0039062 C 7.0078125 6.2509062 9.247 4.0097656 12 4.0097656 z M 12 6.5 C 10.619 6.5 9.5 7.619 9.5 9 C 9.5 10.381 10.619 11.5 12 11.5 C 13.381 11.5 14.5 10.381 14.5 9 C 14.5 7.619 13.381 6.5 12 6.5 z" fill="#000000"/></svg>
diff --git a/modern/src/DeviceList.js b/modern/src/DeviceList.js
index c500242f..f636921d 100644
--- a/modern/src/DeviceList.js
+++ b/modern/src/DeviceList.js
@@ -1,6 +1,5 @@
 import React, { Component, Fragment } from 'react';
 import { connect } from 'react-redux';
-import { updateDevices } from './actions';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemAvatar from '@material-ui/core/ListItemAvatar';
@@ -13,20 +12,10 @@ import MoreVertIcon from '@material-ui/icons/MoreVert';
 import Divider from '@material-ui/core/Divider';
 
 const mapStateToProps = state => ({
-  devices: state.devices
+  devices: Array.from(state.devices.values())
 });
 
 class DeviceList extends Component {
-  componentDidMount() {
-    fetch('/api/devices').then(response => {
-      if (response.ok) {
-        response.json().then(devices => {
-          this.props.dispatch(updateDevices(devices));
-        });
-      }
-    });
-  }
-
   render() {
     const devices = this.props.devices.map((device, index, list) =>
       <Fragment key={device.id.toString()}>
diff --git a/modern/src/MainMap.js b/modern/src/MainMap.js
index 925b402a..1a8542a6 100644
--- a/modern/src/MainMap.js
+++ b/modern/src/MainMap.js
@@ -3,18 +3,22 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import mapboxgl from 'mapbox-gl';
 
+const mapFeatureProperties = (state, position) => {
+  return {
+    name: state.devices.get(position.deviceId).name
+  }
+}
+
 const mapStateToProps = state => ({
   data: {
     type: 'FeatureCollection',
-    features: state.positions.map(position => ({
+    features: Array.from(state.positions.values()).map(position => ({
       type: 'Feature',
       geometry: {
         type: 'Point',
         coordinates: [position.longitude, position.latitude]
       },
-      properties: {
-        ...position
-      }
+      properties: mapFeatureProperties(state, position)
     }))
   }
 });
@@ -40,7 +44,6 @@ class MainMap extends Component {
       canvas.style.width = `${image.width}px`;
       canvas.style.height = `${image.height}px`;
       const context = canvas.getContext('2d');
-      context.imageSmoothingEnabled = false;
       context.drawImage(image, 0, 0, canvas.width, canvas.height);
       this.map.addImage(key, context.getImageData(0, 0, canvas.width, canvas.height), {
         pixelRatio: window.devicePixelRatio
@@ -53,6 +56,7 @@ class MainMap extends Component {
     this.map = map;
 
     this.loadImage('background', 'images/background.svg');
+    this.loadImage('icon-marker', 'images/icon/marker.svg');
 
     map.addSource('positions', {
       'type': 'geojson',
@@ -65,15 +69,29 @@ class MainMap extends Component {
       'source': 'positions',
       'layout': {
         'icon-image': 'background',
-        'text-field': 'Test Device Name',
+        'icon-allow-overlap': true,
+        'text-field': '{name}',
+        'text-allow-overlap': true,
+        'text-anchor': 'bottom',
+        'text-offset': [0, -2],
         'text-font': ['Roboto Regular'],
-        'text-size': 11
+        'text-size': 12
       },
       'paint':{
         'text-halo-color': 'white',
         'text-halo-width': 1
      }
     });
+
+    map.addLayer({
+      'id': 'device-icon',
+      'type': 'symbol',
+      'source': 'positions',
+      'layout': {
+        'icon-image': 'icon-marker',
+        'icon-allow-overlap': true
+      }
+    });
   }
 
   componentDidUpdate(prevProps) {
diff --git a/modern/src/SocketController.js b/modern/src/SocketController.js
index f65fc6c1..b89845f2 100644
--- a/modern/src/SocketController.js
+++ b/modern/src/SocketController.js
@@ -43,7 +43,14 @@ class SocketController extends Component {
   }
 
   componentDidMount() {
-    this.connectSocket();
+    fetch('/api/devices').then(response => {
+      if (response.ok) {
+        response.json().then(devices => {
+          this.props.dispatch(updateDevices(devices));
+        });
+      }
+      this.connectSocket();
+    });
   }
 
   render() {
diff --git a/modern/src/reducers/index.js b/modern/src/reducers/index.js
index ac592bfe..4593d1f3 100644
--- a/modern/src/reducers/index.js
+++ b/modern/src/reducers/index.js
@@ -1,20 +1,26 @@
 const initialState = {
-  devices: [],
-  positions: [],
-  events: []
+  devices: new Map(),
+  positions: new Map()
 };
 
+function updateMap(map, array, key) {
+  for (let value of array) {
+    map.set(value[key], value);
+  }
+  return map;
+}
+
 function rootReducer(state = initialState, action) {
   switch (action.type) {
     case 'UPDATE_DEVICES':
       return Object.assign({}, {
         ...state,
-        devices: [...action.devices]
+        devices: updateMap(state.devices, action.devices, 'id')
       });
     case 'UPDATE_POSITIONS':
       return Object.assign({}, {
         ...state,
-        positions: [...action.positions]
+        positions: updateMap(state.positions, action.positions, 'deviceId')
       });
     default:
       return state;