From 6d48729efb4bd1ac34bba003a8a4313a70a02cce Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 16 Feb 2013 16:55:44 +1300 Subject: Handle clicks on markers (fix #8) --- .../web/client/controller/MapController.java | 50 ++++++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) (limited to 'src/org/traccar/web/client/controller/MapController.java') diff --git a/src/org/traccar/web/client/controller/MapController.java b/src/org/traccar/web/client/controller/MapController.java index 44094f7..13c736f 100644 --- a/src/org/traccar/web/client/controller/MapController.java +++ b/src/org/traccar/web/client/controller/MapController.java @@ -17,8 +17,10 @@ package org.traccar.web.client.controller; import java.util.Collections; import java.util.Comparator; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import org.traccar.web.client.Application; import org.traccar.web.client.view.MapView; @@ -29,14 +31,22 @@ import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.sencha.gxt.widget.core.client.ContentPanel; -public class MapController implements ContentController { +public class MapController implements ContentController, MapView.MapHandler { private static final int UPDATE_INTERVAL = 15000; + public interface MapHandler { + public void onDeviceSelected(Device device); + public void onArchivePositionSelected(Position position); + } + + private MapHandler mapHandler; + private MapView mapView; - public MapController() { - mapView = new MapView(); + public MapController(MapHandler mapHandler) { + this.mapHandler = mapHandler; + mapView = new MapView(this); } @Override @@ -57,12 +67,20 @@ public class MapController implements ContentController { update(); } + private Map latestPositionMap = new HashMap(); + public void update() { updateTimer.cancel(); Application.getDataService().getLatestPositions(new AsyncCallback>() { @Override public void onSuccess(List result) { mapView.showLatestPositions(result); + for (Position position : result) { + latestPositionMap.put(position.getDevice().getId(), position); + } + for (Map.Entry entry : positionUpdateMap.entrySet()) { + entry.getValue().onUpdate(latestPositionMap.get(entry.getKey())); + } updateTimer.schedule(UPDATE_INTERVAL); } @Override @@ -91,4 +109,30 @@ public class MapController implements ContentController { mapView.selectArchivePosition(position); } + public interface PositionUpdateHandler { + public void onUpdate(Position position); + } + + private Map positionUpdateMap = new HashMap(); + + + public void registerPositionUpdate(Device device, PositionUpdateHandler handler) { + positionUpdateMap.put(device.getId(), handler); + handler.onUpdate(latestPositionMap.get(device.getId())); + } + + public void unregisterPositionUpdate(Device device) { + positionUpdateMap.remove(device.getId()); + } + + @Override + public void onPositionSelected(Position position) { + mapHandler.onDeviceSelected(position.getDevice()); + } + + @Override + public void onArchivePositionSelected(Position position) { + mapHandler.onArchivePositionSelected(position); + } + } -- cgit v1.2.3