From b3decf8ae049a7463e7de7afc09e181b06addb28 Mon Sep 17 00:00:00 2001
From: Daniel Stonier <d.stonier@gmail.com>
Date: Mon, 23 Feb 2015 22:31:19 +0900
Subject: [PATCH] [map_manager] updated and compiling for indigo, but disabled
 add/hide layers.

This updates the api for indigo with the changes discussed in #42. It couldn't
replace the add/hide layers (that toggle the occupancy grid map) though. Fix
this when we have a turtlebot to test with.
---
 .../map_manager/MainActivity.java             | 45 ++++++++++++-------
 settings.gradle                               |  2 -
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/map_manager/src/main/java/com/github/rosjava/android_apps/map_manager/MainActivity.java b/map_manager/src/main/java/com/github/rosjava/android_apps/map_manager/MainActivity.java
index dcb1a47..8e2fceb 100644
--- a/map_manager/src/main/java/com/github/rosjava/android_apps/map_manager/MainActivity.java
+++ b/map_manager/src/main/java/com/github/rosjava/android_apps/map_manager/MainActivity.java
@@ -41,7 +41,9 @@
 import android.widget.ListView;
 
 import com.github.rosjava.android_remocons.common_tools.apps.RosAppActivity;
+import com.google.common.collect.Lists;
 
+import org.ros.android.view.visualization.layer.Layer;
 import org.ros.namespace.NameResolver;
 import org.ros.node.NodeConfiguration;
 import org.ros.node.NodeMainExecutor;
@@ -200,27 +202,32 @@ protected void init(NodeMainExecutor nodeMainExecutor) {
 		nodeConfiguration = NodeConfiguration.newPublic(InetAddressFactory
 				.newNonLoopback().getHostAddress(), getMasterUri());
 
-		CameraControlLayer cameraControlLayer = new CameraControlLayer(this,
-				nodeMainExecutor.getScheduledExecutorService());
+		CameraControlLayer cameraControlLayer = new CameraControlLayer();
 		cameraControlLayer.addListener(new CameraControlListener() {
 			@Override
-			public void onZoom(double focusX, double focusY, double factor) {
-			}
+			public void onZoom(float focusX, float focusY, float factor) {}
+
+            @Override
+            public void onDoubleTap(float x, float y) {}
 
 			@Override
-			public void onTranslate(float distanceX, float distanceY) {
-			}
+			public void onTranslate(float distanceX, float distanceY) {}
 
 			@Override
-			public void onRotate(double focusX, double focusY, double deltaAngle) {
-			}
+			public void onRotate(float focusX, float focusY, double deltaAngle) {}
 
 		});
-		mapView.addLayer(cameraControlLayer);
         NameResolver appNameSpace = getMasterNameSpace();
         String mapTopic = remaps.get(getString(R.string.map_topic));
 		occupancyGridLayer = new OccupancyGridLayer(appNameSpace.resolve(mapTopic).toString());
-		mapView.addLayer(occupancyGridLayer);
+
+        mapView.onCreate(
+                Lists.<Layer>newArrayList(
+                        cameraControlLayer,
+                        occupancyGridLayer
+                )
+        );
+
 		nodeMainExecutor.execute(mapView, nodeConfiguration.setNodeName("android/map_view"));
 
 		updateMapList();
@@ -249,10 +256,13 @@ public void onFailure(RemoteException e) {
 					@Override
 					public void onSuccess(PublishMapResponse message) {
 						safeDismissWaitingDialog();
-						if (!visibleMapView) {
-							mapView.addLayer(occupancyGridLayer);
-							visibleMapView = true;
-						}
+                        // disabling temporarily until testing
+                        // this api got deprecated
+                        // see https://github.com/rosjava/android_apps/issues/42
+                        // if (!visibleMapView) {
+						//	mapView.addLayer(occupancyGridLayer);
+						//	visibleMapView = true;
+						// }
 					}
 				});
 
@@ -381,8 +391,11 @@ public void onSuccess(DeleteMapResponse arg0) {
 									}
 									switch (radioFocusRelation) {
 									case 0:
-										mapView.hideLayer(occupancyGridLayer);
-										visibleMapView = false;
+                                        // disabling temporarily until testing
+                                        // this api got deprecated
+                                        // see https://github.com/rosjava/android_apps/issues/42
+										//mapView.hideLayer(occupancyGridLayer);
+										//visibleMapView = false;
 										radioFocus = -1;
 										break;
 									case 1:
diff --git a/settings.gradle b/settings.gradle
index cef5d94..e399f3f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,6 +17,4 @@
 include 'teleop'
 include 'map_nav'
 include 'make_a_map'
-/*
 include 'map_manager'
-*/