Handle clicks on markers (fix #8)

8 files changed, 187 insertions, 15 deletions

diff --git a/src/org/traccar/web/client/view/ApplicationView.java b/src/org/traccar/web/client/view/ApplicationView.java
index f4c42e5..dfa5335 100644
--- a/src/org/traccar/web/client/view/ApplicationView.java
+++ b/src/org/traccar/web/client/view/ApplicationView.java
@@ -33,13 +33,17 @@ public class ApplicationView extends Composite {
     ContentPanel devicePanel;
 
     @UiField(provided = true)
+    ContentPanel statePanel;
+
+    @UiField(provided = true)
     ContentPanel mapPanel;
 
     @UiField(provided = true)
     ContentPanel archivePanel;
 
-    public ApplicationView(ContentPanel deviceView, ContentPanel mapView, ContentPanel archiveView) {
+    public ApplicationView(ContentPanel deviceView, ContentPanel stateView, ContentPanel mapView, ContentPanel archiveView) {
         devicePanel = deviceView;
+        statePanel = stateView;
         mapPanel = mapView;
         archivePanel = archiveView;
         initWidget(uiBinder.createAndBindUi(this));
diff --git a/src/org/traccar/web/client/view/ApplicationView.ui.xml b/src/org/traccar/web/client/view/ApplicationView.ui.xml
index 2faae1e..0b05ab9 100644
--- a/src/org/traccar/web/client/view/ApplicationView.ui.xml
+++ b/src/org/traccar/web/client/view/ApplicationView.ui.xml
@@ -5,7 +5,10 @@
     xmlns:container="urn:import:com.sencha.gxt.widget.core.client.container"
     xmlns:gxt="urn:import:com.sencha.gxt.widget.core.client">
 
-  <ui:with type="com.sencha.gxt.core.client.util.Margins" field="westMargins">
+  <ui:with type="com.sencha.gxt.core.client.util.Margins" field="topMargins">
+    <ui:attributes top="5" right="0" bottom="0" left="0" />
+  </ui:with>
+    <ui:with type="com.sencha.gxt.core.client.util.Margins" field="westMargins">
     <ui:attributes top="5" right="5" bottom="0" left="5" />
   </ui:with>
   <ui:with type="com.sencha.gxt.core.client.util.Margins" field="centerMargins">
@@ -25,10 +28,21 @@
     <ui:attributes size="0.25" maxSize="2147483647" margins="{southMargins}" split="true" />
   </ui:with>
 
+  <ui:with type="com.sencha.gxt.widget.core.client.container.BorderLayoutContainer.BorderLayoutData" field="bottomData">
+    <ui:attributes size="0.5" maxSize="2147483647" margins="{topMargins}" split="true" />
+  </ui:with>
+  
   <container:Viewport>
     <container:BorderLayoutContainer>
       <container:west layoutData="{westData}">
-        <gxt:ContentPanel ui:field="devicePanel" />
+        <container:BorderLayoutContainer>
+          <container:center>
+            <gxt:ContentPanel ui:field="devicePanel" />
+          </container:center>
+          <container:south layoutData="{bottomData}">
+            <gxt:ContentPanel ui:field="statePanel" />
+          </container:south>
+        </container:BorderLayoutContainer>
       </container:west>
       <container:center layoutData="{centerData}">
         <gxt:ContentPanel ui:field="mapPanel" />
diff --git a/src/org/traccar/web/client/view/ArchiveView.java b/src/org/traccar/web/client/view/ArchiveView.java
index 67b5750..32e569e 100644
--- a/src/org/traccar/web/client/view/ArchiveView.java
+++ b/src/org/traccar/web/client/view/ArchiveView.java
@@ -181,4 +181,8 @@ public class ArchiveView implements SelectionChangedEvent.SelectionChangedHandle
 
     };
 
+    public void selectPosition(Position position) {
+        grid.getSelectionModel().select(positionStore.findModel(position), false);
+    }
+
 }
diff --git a/src/org/traccar/web/client/view/DeviceView.java b/src/org/traccar/web/client/view/DeviceView.java
index 5f6441b..c3f3f7a 100644
--- a/src/org/traccar/web/client/view/DeviceView.java
+++ b/src/org/traccar/web/client/view/DeviceView.java
@@ -134,4 +134,8 @@ public class DeviceView implements SelectionChangedEvent.SelectionChangedHandler
         });
     }
 
+    public void selectDevice(Device device) {
+        grid.getSelectionModel().select(deviceStore.findModel(device), false);
+    }
+
 }
diff --git a/src/org/traccar/web/client/view/MapPositionRenderer.java b/src/org/traccar/web/client/view/MapPositionRenderer.java
index f1bf57c..15ba082 100644
--- a/src/org/traccar/web/client/view/MapPositionRenderer.java
+++ b/src/org/traccar/web/client/view/MapPositionRenderer.java
@@ -21,6 +21,8 @@ import java.util.Map;
 
 import org.gwtopenmaps.openlayers.client.Icon;
 import org.gwtopenmaps.openlayers.client.Marker;
+import org.gwtopenmaps.openlayers.client.event.EventHandler;
+import org.gwtopenmaps.openlayers.client.event.EventObject;
 import org.gwtopenmaps.openlayers.client.feature.VectorFeature;
 import org.gwtopenmaps.openlayers.client.geometry.LineString;
 import org.gwtopenmaps.openlayers.client.geometry.Point;
@@ -29,9 +31,16 @@ import org.gwtopenmaps.openlayers.client.layer.Vector;
 import org.traccar.web.shared.model.Device;
 import org.traccar.web.shared.model.Position;
 
+import com.google.gwt.dom.client.Style;
+import com.google.gwt.user.client.ui.RootPanel;
+
 
 public class MapPositionRenderer {
 
+    public interface SelectHandler {
+        public void onSelected(Position position);
+    }
+
     private final MapView mapView;
     private final MarkerIconFactory.IconType iconType;
 
@@ -43,14 +52,41 @@ public class MapPositionRenderer {
         return mapView.getMarkerLayer();
     }
 
-    public MapPositionRenderer(MapView mapView, MarkerIconFactory.IconType iconType) {
+    private SelectHandler selectHandler;
+
+    public MapPositionRenderer(MapView mapView, MarkerIconFactory.IconType iconType, SelectHandler selectHandler) {
         this.mapView = mapView;
         this.iconType = iconType;
+        this.selectHandler = selectHandler;
+    }
+
+    private void addSelectEvent(Marker marker, final Position position) {
+        if (selectHandler != null) {
+            marker.getEvents().register("click", marker, new EventHandler() {
+                @Override
+                public void onHandle(EventObject eventObject) {
+                    selectHandler.onSelected(position);
+                }
+            });
+            marker.getEvents().register("mouseover", marker, new EventHandler() {
+                @Override
+                public void onHandle(EventObject eventObject) {
+                    RootPanel.get().getElement().getStyle().setCursor(Style.Cursor.SE_RESIZE);
+                }
+            });
+            marker.getEvents().register("mouseout", marker, new EventHandler() {
+                @Override
+                public void onHandle(EventObject eventObject) {
+                    RootPanel.get().getElement().getStyle().setCursor(Style.Cursor.AUTO);
+                }
+            });
+        }
     }
 
     private void changeMarkerIcon(Long positionId, Icon icon) {
         Marker oldMarker = markerMap.get(positionId);
         Marker newMarker = new Marker(oldMarker.getLonLat(), icon);
+        addSelectEvent(newMarker, positionMap.get(positionId));
         markerMap.put(positionId, newMarker);
         getMarkerLayer().addMarker(newMarker);
         getMarkerLayer().removeMarker(oldMarker);
@@ -58,6 +94,7 @@ public class MapPositionRenderer {
 
     private Map<Long, Marker> markerMap = new HashMap<Long, Marker>(); // Position.id -> Marker
     private Map<Long, Long> deviceMap = new HashMap<Long, Long>(); // Device.id -> Position.id
+    private Map<Long, Position> positionMap = new HashMap<Long, Position>(); // Position.id -> Position
 
     private Long selectedPositionId;
     private Long selectedDeviceId;
@@ -68,6 +105,7 @@ public class MapPositionRenderer {
         }
         markerMap.clear();
         deviceMap.clear();
+        positionMap.clear();
 
         for (Position position : positions) {
             Marker marker = new Marker(
@@ -75,6 +113,8 @@ public class MapPositionRenderer {
                     MarkerIconFactory.getIcon(iconType, false));
             markerMap.put(position.getId(), marker);
             deviceMap.put(position.getDevice().getId(), position.getId());
+            positionMap.put(position.getId(), position);
+            addSelectEvent(marker, position);
             getMarkerLayer().addMarker(marker);
         }
 
diff --git a/src/org/traccar/web/client/view/MapView.java b/src/org/traccar/web/client/view/MapView.java
index f57ec65..e54381d 100644
--- a/src/org/traccar/web/client/view/MapView.java
+++ b/src/org/traccar/web/client/view/MapView.java
@@ -47,6 +47,13 @@ import com.sencha.gxt.widget.core.client.ContentPanel;
 
 public class MapView {
 
+    public interface MapHandler {
+        public void onPositionSelected(Position position);
+        public void onArchivePositionSelected(Position position);
+    }
+
+    private MapHandler mapHandler;
+
     private ContentPanel contentPanel;
 
     public ContentPanel getView() {
@@ -81,33 +88,34 @@ public class MapView {
         point.transform(new Projection("EPSG:4326"), new Projection(map.getProjection()));
         return point;
     }
-    
+
     private void initMapLayers(Map map) {
         map.addLayer(OSM.Mapnik("OpenStreetMap"));
-        
+
         GoogleV3Options gHybridOptions = new GoogleV3Options();
         gHybridOptions.setType(GoogleV3MapType.G_HYBRID_MAP);
         map.addLayer(new GoogleV3("Google Hybrid", gHybridOptions));
- 
+
         GoogleV3Options gNormalOptions = new GoogleV3Options();
         gNormalOptions.setType(GoogleV3MapType.G_NORMAL_MAP);
         map.addLayer(new GoogleV3("Google Normal", gNormalOptions));
- 
+
         GoogleV3Options gSatelliteOptions = new GoogleV3Options();
         gSatelliteOptions.setType(GoogleV3MapType.G_SATELLITE_MAP);
         map.addLayer(new GoogleV3("Google Satellite", gSatelliteOptions));
- 
+
         GoogleV3Options gTerrainOptions = new GoogleV3Options();
         gTerrainOptions.setType(GoogleV3MapType.G_TERRAIN_MAP);
-        map.addLayer(new GoogleV3("Google Terrain", gTerrainOptions));    	
-        
+        map.addLayer(new GoogleV3("Google Terrain", gTerrainOptions));
+
         final String bingKey = "AseEs0DLJhLlTNoxbNXu7DGsnnH4UoWuGue7-irwKkE3fffaClwc9q_Mr6AyHY8F";
         map.addLayer(new Bing(new BingOptions("Bing Road", bingKey, BingType.ROAD)));
         map.addLayer(new Bing(new BingOptions("Bing Hybrid", bingKey, BingType.HYBRID)));
         map.addLayer(new Bing(new BingOptions("Bing Aerial", bingKey, BingType.AERIAL)));
     }
 
-    public MapView() {
+    public MapView(MapHandler mapHandler) {
+        this.mapHandler = mapHandler;
         contentPanel = new ContentPanel();
         contentPanel.setHeadingText("Map");
 
@@ -124,7 +132,7 @@ public class MapView {
         markerLayer = new Markers("Markers", markersOptions);
 
         initMapLayers(map);
-        
+
         map.addLayer(vectorLayer);
         map.addLayer(markerLayer);
 
@@ -147,8 +155,8 @@ public class MapView {
             }
         });
 
-        latestPositionRenderer = new MapPositionRenderer(this, MarkerIconFactory.IconType.iconLatest);
-        archivePositionRenderer = new MapPositionRenderer(this, MarkerIconFactory.IconType.iconArchive);
+        latestPositionRenderer = new MapPositionRenderer(this, MarkerIconFactory.IconType.iconLatest, latestPositionSelectHandler);
+        archivePositionRenderer = new MapPositionRenderer(this, MarkerIconFactory.IconType.iconArchive, archivePositionSelectHandler);
     }
 
     private final MapPositionRenderer latestPositionRenderer;
@@ -172,4 +180,22 @@ public class MapView {
         archivePositionRenderer.selectPosition(position, true);
     }
 
+    private MapPositionRenderer.SelectHandler latestPositionSelectHandler = new MapPositionRenderer.SelectHandler() {
+
+        @Override
+        public void onSelected(Position position) {
+            mapHandler.onPositionSelected(position);
+        }
+
+    };
+
+    private MapPositionRenderer.SelectHandler archivePositionSelectHandler = new MapPositionRenderer.SelectHandler() {
+
+        @Override
+        public void onSelected(Position position) {
+            mapHandler.onArchivePositionSelected(position);
+        }
+
+    };
+
 }
diff --git a/src/org/traccar/web/client/view/StateView.java b/src/org/traccar/web/client/view/StateView.java
new file mode 100644
index 0000000..700d55a
--- /dev/null
+++ b/src/org/traccar/web/client/view/StateView.java
@@ -0,0 +1,58 @@
+package org.traccar.web.client.view;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.traccar.web.client.model.StateItem;
+import org.traccar.web.client.model.StateItemProperties;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Widget;
+import com.sencha.gxt.data.shared.ListStore;
+import com.sencha.gxt.widget.core.client.ContentPanel;
+import com.sencha.gxt.widget.core.client.grid.ColumnConfig;
+import com.sencha.gxt.widget.core.client.grid.ColumnModel;
+import com.sencha.gxt.widget.core.client.grid.Grid;
+
+public class StateView {
+
+    private static StateViewUiBinder uiBinder = GWT.create(StateViewUiBinder.class);
+
+    interface StateViewUiBinder extends UiBinder<Widget, StateView> {
+    }
+
+    @UiField
+    ContentPanel contentPanel;
+
+    public ContentPanel getView() {
+        return contentPanel;
+    }
+
+    @UiField(provided = true)
+    ColumnModel<StateItem> columnModel;
+
+    @UiField(provided = true)
+    ListStore<StateItem> stateStore;
+
+    @UiField
+    Grid<StateItem> grid;
+
+    public StateView(ListStore<StateItem> stateStore) {
+        this.stateStore = stateStore;
+
+        StateItemProperties stateItemProperties = GWT.create(StateItemProperties.class);
+
+        List<ColumnConfig<StateItem, ?>> columnConfigList = new LinkedList<ColumnConfig<StateItem, ?>>();
+        columnConfigList.add(new ColumnConfig<StateItem, String>(stateItemProperties.name(), 0, "Attribute"));
+        columnConfigList.add(new ColumnConfig<StateItem, String>(stateItemProperties.value(), 0, "Value"));
+        columnModel = new ColumnModel<StateItem>(columnConfigList);
+
+        uiBinder.createAndBindUi(this);
+
+        grid.getSelectionModel().setLocked(true);
+    }
+
+}
+
diff --git a/src/org/traccar/web/client/view/StateView.ui.xml b/src/org/traccar/web/client/view/StateView.ui.xml
new file mode 100644
index 0000000..2a7c2ac
--- /dev/null
+++ b/src/org/traccar/web/client/view/StateView.ui.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder
+    xmlns:ui="urn:ui:com.google.gwt.uibinder"
+    xmlns:g="urn:import:com.google.gwt.user.client.ui"
+    xmlns:container="urn:import:com.sencha.gxt.widget.core.client.container"
+    xmlns:gxt="urn:import:com.sencha.gxt.widget.core.client"
+    xmlns:toolbar="urn:import:com.sencha.gxt.widget.core.client.toolbar"
+    xmlns:grid="urn:import:com.sencha.gxt.widget.core.client.grid"
+    xmlns:button="urn:import:com.sencha.gxt.widget.core.client.button">
+
+  <ui:with type="com.sencha.gxt.data.shared.ListStore" field="stateStore" />
+  <ui:with type="com.sencha.gxt.widget.core.client.grid.ColumnModel" field="columnModel" />
+
+  <ui:with type="com.sencha.gxt.widget.core.client.grid.GridView" field="view">
+    <ui:attributes stripeRows="true" autoFill="true" />
+  </ui:with>
+
+  <gxt:ContentPanel ui:field="contentPanel" headingText="State">
+    <grid:Grid ui:field="grid" store="{stateStore}" cm="{columnModel}" view="{view}" />
+  </gxt:ContentPanel>
+
+</ui:UiBinder>