Merge remote-tracking branch 'remotes/origin/master' into nr/debugMonitor-clemens

src/de/tudarmstadt/maki/simonstrator/api/component/sensor/location/LocationActuator.java

@@ -43,13 +43,6 @@ public interface LocationActuator extends LocationSensor {
 	 */
 	public void updateCurrentLocation(Location newLocation);
 
-	/**
-	 * Returns the current target {@link AttractionPoint} a node is approaching.
-	 * 
-	 * @return
-	 */
-	public AttractionPoint getCurrentTargetAttractionPoint();
-
 	/**
 	 * A way to interact with node movement from within applications and the
 	 * like. This is an optional operation - it is expected to throw an

src/de/tudarmstadt/maki/simonstrator/api/component/sensor/location/LocationSensor.java

@@ -27,10 +27,13 @@ import de.tudarmstadt.maki.simonstrator.api.component.sensor.SensorComponent;
  * Android Platform. Provides access to the last known location (energy
  * efficient) or QoS-Specifications for regular location updates.
  * 
- * @see http 
+ * Also offers access to the target attraction point
+ * 
+ * @see http
  *      ://developer.android.com/reference/com/google/android/gms/location/package
  *      -summary.html
  * @author Bjoern Richerzhagen
+ * @author Julian Zobel
  * 
  */
 public interface LocationSensor extends SensorComponent {
@@ -74,4 +77,12 @@ public interface LocationSensor extends SensorComponent {
 	 */
 	public LocationRequest getLocationRequest();
 
+	/**
+	 * Retrieve the targeted {@link AttractionPoint}, representing the location
+	 * the node is currently approaching.
+	 * 
+	 * @return
+	 */
+	public AttractionPoint getCurrentTargetAttractionPoint();
+
 }