Merge branch 'nr/monitoring-req-resp' into 'nr/debugMonitor-clemens'

Merge Nr/monitoring req resp into nr/debugMonitor-Clemens

See merge request !2

src/de/tudarmstadt/maki/simonstrator/api/component/pubsub/LocationPubSubComponent.java

@@ -79,4 +79,18 @@ public interface LocationPubSubComponent extends PubSubComponent {
 			List<Attribute<?>> attributes, Location location,
 			double radiusOfInterest, byte[] payload);
 
+	/**
+	 * Creates a notification that is valid at the current location of the
+	 * client (as known by the filter scheme)
+	 * 
+	 * @param topic
+	 * @param attributes
+	 * @param radiusOfInterest
+	 * @param payload
+	 *            optional, can be null
+	 * @return
+	 */
+	public Notification createLocalNotification(Topic topic, List<Attribute<?>> attributes, double radiusOfInterest,
+			byte[] payload);
+
 }

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

@@ -65,7 +65,7 @@ public interface Location extends Transmitable, Cloneable {
 	 * 
 	 * In most simulation setups, instead of geographic coordinates, we simply
 	 * rely on x and y (therefore, please use distanceTo and bearingTo for
-	 * calculations)! In such circumstances, the Latitude corresponds to
+	 * calculations)! In such circumstances, the Longitude corresponds to
 	 * <strong>x</strong>.
 	 * 
 	 * @return longitude (or x)

src/de/tudarmstadt/maki/simonstrator/api/component/sis/type/SiSTypes.java

@@ -92,6 +92,11 @@ public final class SiSTypes {
 	public static final SiSType<Double> LATENCY_CELL = create("LATENCY_CELL",
 			Double.class, new AggregationDouble());
 
+	/**
+	 * Current estimated node speed in m/s in the physical world.
+	 */
+	public static final SiSType<Double> PHY_SPEED = create("PHY_SPEED", Double.class, new AggregationDouble());
+
 	/**
 	 * [none] Just a dummy Test attribute of type double. Do not use in
 	 * production code.