feat(perception): Use 2D bounding boxes for Occlusion Modifiers

app/tutorials/example-applications/src/main/java/org/eclipse/mosaic/app/examples/commuter/SimpleCommuterApp.java

@@ -34,6 +34,7 @@
 import org.eclipse.mosaic.rti.TIME;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -186,6 +187,14 @@ public boolean equals(Object obj) {
                     .append(this.homePosition, event.homePosition)
                     .isEquals();
         }
+
+        @Override
+        public int hashCode() {
+            return new HashCodeBuilder(17, 37)
+                    .append(currentPosition)
+                    .append(homePosition)
+                    .toHashCode();
+        }
     }
 
     /**

fed/mosaic-application/src/main/java/org/eclipse/mosaic/fed/application/ambassador/simulation/perception/CentralPerceptionComponent.java

@@ -225,63 +225,51 @@ static class MonitoringTrafficObjectIndexProvider extends TrafficObjectIndex {
 
         @Override
         public List<VehicleObject> getVehiclesInRange(PerceptionModel searchRange) {
+            int numberOfVehicles = getNumberOfVehicles();
             try (PerformanceMonitor.Measurement m = monitor.start("search-vehicle")) {
-                m.setProperties(getNumberOfVehicles(), SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
+                m.setProperties(numberOfVehicles, SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
                 return super.getVehiclesInRange(searchRange);
             }
         }
 
         @Override
         public void removeVehicles(Iterable<String> vehiclesToRemove) {
+            int numberOfVehicles = getNumberOfVehicles();
             try (PerformanceMonitor.Measurement m = monitor.start("remove-vehicle")) {
-                m.setProperties(getNumberOfVehicles(), SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
+                m.setProperties(numberOfVehicles, SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
                 super.removeVehicles(vehiclesToRemove);
             }
         }
 
         @Override
         public void updateVehicles(Iterable<VehicleData> vehiclesToUpdate) {
+            int numberOfVehicles = getNumberOfVehicles();
             try (PerformanceMonitor.Measurement m = monitor.start("update-vehicle")) {
-                m.setProperties(getNumberOfVehicles(), SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
+                m.setProperties(numberOfVehicles, SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
                 super.updateVehicles(vehiclesToUpdate);
             }
         }
 
-        @Override
-        public int getNumberOfVehicles() {
-            return super.getNumberOfVehicles();
-        }
-
         @Override
         public List<TrafficLightObject> getTrafficLightsInRange(PerceptionModel perceptionModel) {
             try (PerformanceMonitor.Measurement m = monitor.start("search-traffic-light")) {
-                m.setProperties(getNumberOfTrafficLights(), SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
+                m.setProperties(SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
                 return super.getTrafficLightsInRange(perceptionModel);
             }
         }
 
-        @Override
-        public void addTrafficLightGroup(TrafficLightGroup trafficLightGroup) {
-            super.addTrafficLightGroup(trafficLightGroup);
-        }
-
         @Override
         public void updateTrafficLights(Map<String, TrafficLightGroupInfo> trafficLightsToUpdate) {
             try (PerformanceMonitor.Measurement m = monitor.start("update-traffic-light")) {
-                m.setProperties(getNumberOfTrafficLights(), SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
+                m.setProperties(SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
                 super.updateTrafficLights(trafficLightsToUpdate);
             }
         }
 
-        @Override
-        public int getNumberOfTrafficLights() {
-            return super.getNumberOfTrafficLights();
-        }
-
         @Override
         public Collection<Edge<Vector3d>> getSurroundingWalls(PerceptionModel perceptionModel) {
             try (PerformanceMonitor.Measurement m = monitor.start("search-walls")) {
-                m.setProperties(getNumberOfTrafficLights(), SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
+                m.setProperties(SimulationKernel.SimulationKernel.getCurrentSimulationTime()).restart();
                 return super.getSurroundingWalls(perceptionModel);
             }
         }

fed/mosaic-application/src/main/java/org/eclipse/mosaic/fed/application/ambassador/simulation/perception/index/TrafficObjectIndex.java

@@ -181,20 +181,6 @@ public void updateTrafficLights(Map<String, TrafficLightGroupInfo> trafficLights
         }
     }
 
-    /**
-     * Returns the number of TLs in the simulation.
-     *
-     * @return the number of TLs
-     */
-    public int getNumberOfTrafficLights() {
-        if (trafficLightIndexProviderConfigured()) {
-            return trafficLightIndex.getNumberOfTrafficLights();
-        } else {
-            log.debug("No Traffic Light Index Provider configured. There are no indexed Traffic Lights.");
-            return 0;
-        }
-    }
-
     public Collection<Edge<Vector3d>> getSurroundingWalls(PerceptionModel perceptionModel) {
         if (wallIndex == null) {
             log.debug("No Wall Index defined.");