diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/BumpProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/BumpProperty.java index bfe815813195746c6991dc77129606854897ee2a..446dcf7da9148017d1fda10c833770b29530eb21 100644 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/BumpProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/BumpProperty.java @@ -68,4 +68,14 @@ public class BumpProperty implements RoadProperty { return new BumpProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof BumpProperty) { + BumpProperty bumpProperty = (BumpProperty) obj; + + return bumpProperty.getEdge().equals(getEdge()) && (bumpProperty.hasBump() == hasBump()); + } + return super.equals(obj); + } + } diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/FogProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/FogProperty.java index 0066019ed08ebfad68d4df1d3044e1dfa63a1359..df2b223036101f0685a9083488a9941a6f5afa08 100644 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/FogProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/FogProperty.java @@ -68,4 +68,14 @@ public class FogProperty implements RoadProperty { return new FogProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof FogProperty) { + FogProperty fogProperty = (FogProperty) obj; + + return fogProperty.getEdge().equals(getEdge()) && (fogProperty.hasFog() == hasFog()); + } + return super.equals(obj); + } + } diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/HazardProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/HazardProperty.java index 67c54a1df1e49372fd91b604986f5bfb4ba6e772..9134f610e09c95e2c6c62fe009e1698c2291e9ce 100644 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/HazardProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/HazardProperty.java @@ -68,4 +68,14 @@ public class HazardProperty implements RoadProperty { return new HazardProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof HazardProperty) { + HazardProperty hazardProperty = (HazardProperty) obj; + + return hazardProperty.getEdge().equals(getEdge()) && (hazardProperty.hasHazard() == hasHazard()); + } + return super.equals(obj); + } + } diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/JamProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/JamProperty.java index 4d9498b5886fd2291d91469920ae6f8ca7b17fd8..66b87beaf0e4b83352bc7b6b1f11ca8ac758a5bd 100755 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/JamProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/JamProperty.java @@ -68,4 +68,14 @@ public class JamProperty implements RoadProperty { return new JamProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof JamProperty) { + JamProperty jamProperty = (JamProperty) obj; + + return jamProperty.getEdge().equals(getEdge()) && (jamProperty.isJammed() == isJammed()); + } + return super.equals(obj); + } + } diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/RainProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/RainProperty.java index 640239a69a0c9b16e1e5016ae44f49976b7b35e9..394ede7e9a0f9cc91d62e1d392a6842804426af3 100644 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/RainProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/RainProperty.java @@ -68,4 +68,14 @@ public class RainProperty implements RoadProperty { return new RainProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof RainProperty) { + RainProperty rainProperty = (RainProperty) obj; + + return rainProperty.getEdge().equals(getEdge()) && (rainProperty.hasRain() == hasRain()); + } + return super.equals(obj); + } + } diff --git a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/TrafficSignProperty.java b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/TrafficSignProperty.java index a9ba93158a95c3b868b670c54c6bc0cacbed6b4e..1731ddb66f7bde3d0ed0f3716bca2d4d898d024a 100644 --- a/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/TrafficSignProperty.java +++ b/src/de/tudarmstadt/maki/simonstrator/api/component/sensor/environment/data/TrafficSignProperty.java @@ -68,4 +68,14 @@ public class TrafficSignProperty implements RoadProperty { return new TrafficSignProperty(_location, _edge, false); } + @Override + public boolean equals(Object obj) { + if (obj instanceof TrafficSignProperty) { + TrafficSignProperty signProperty = (TrafficSignProperty) obj; + + return signProperty.getEdge().equals(getEdge()) && (signProperty.hasSign() == hasSign()); + } + return super.equals(obj); + } + }