feat(charging): provide the charging stations within a certain area #446
+287
−3
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,4 +65,5 @@ buildNumber.properties | |
| *.log | ||
| credentials.cached | ||
| *.lcs | ||
| .tiles | ||
| /logs/ | ||
schwepmo marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| /* | ||
| * Copyright (c) 2025 Fraunhofer FOKUS and others. All rights reserved. | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0 | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contact: [email protected] | ||
| */ | ||
|
|
||
| package org.eclipse.mosaic.fed.application.ambassador.simulation.electric.objects; | ||
|
|
||
| import org.eclipse.mosaic.fed.application.ambassador.simulation.perception.index.objects.PointBoundingBox; | ||
| import org.eclipse.mosaic.fed.application.ambassador.simulation.perception.index.objects.SpatialObject; | ||
| import org.eclipse.mosaic.fed.application.ambassador.simulation.perception.index.objects.SpatialObjectBoundingBox; | ||
| import org.eclipse.mosaic.lib.geo.CartesianPoint; | ||
| import org.eclipse.mosaic.lib.objects.electricity.ChargingStationData; | ||
|
|
||
| import org.apache.commons.lang3.builder.EqualsBuilder; | ||
| import org.apache.commons.lang3.builder.HashCodeBuilder; | ||
|
|
||
| public class ChargingStationObject extends SpatialObject<ChargingStationObject> { | ||
| /** | ||
| * The data object that stores all static and dynamic information of the charging station. | ||
| */ | ||
| private ChargingStationData chargingStationData; | ||
|
There was a problem hiding this comment. This field stores references to the objects contained within the There was a problem hiding this comment. Looking into the |
||
|
|
||
| /** | ||
| * The bounding box of a charging station is represented by a single point. | ||
| */ | ||
| private transient PointBoundingBox boundingBox; | ||
|
|
||
| public ChargingStationObject(String id) { | ||
| super(id); | ||
| } | ||
|
|
||
| public ChargingStationObject setChargingStationData(ChargingStationData chargingStationData) { | ||
| this.chargingStationData = chargingStationData; | ||
| return this; | ||
| } | ||
|
|
||
| public ChargingStationData getChargingStationData() { | ||
| return chargingStationData; | ||
| } | ||
|
|
||
| @Override | ||
| public ChargingStationObject setPosition(CartesianPoint position) { | ||
| cartesianPosition.set(position); | ||
| position.toVector3d(this); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public SpatialObjectBoundingBox getBoundingBox() { | ||
| if (boundingBox == null) { | ||
| boundingBox = new PointBoundingBox(this); | ||
| } | ||
| return boundingBox; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
|
|
||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
|
|
||
| ChargingStationObject that = (ChargingStationObject) o; | ||
|
|
||
| return new EqualsBuilder() | ||
| .appendSuper(super.equals(o)) | ||
| .append(chargingStationData, that.chargingStationData) | ||
| .append(boundingBox, that.boundingBox) | ||
| .isEquals(); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return new HashCodeBuilder(5, 11) | ||
| .appendSuper(super.hashCode()) | ||
| .append(chargingStationData) | ||
kschrab marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .toHashCode(); | ||
| } | ||
|
|
||
| /** | ||
| * Returns a hard copy of the {@link ChargingStationObject}, this should be used | ||
| * when the data of a perceived traffic light is to be altered or stored in memory. | ||
| * | ||
| * @return a copy of the {@link ChargingStationObject} | ||
| */ | ||
| @Override | ||
| public ChargingStationObject copy() { | ||
| return new ChargingStationObject(getId()) | ||
| .setChargingStationData(chargingStationData) | ||
| .setPosition(getProjectedPosition()); | ||
|
|
||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * Copyright (c) 2025 Fraunhofer FOKUS and others. All rights reserved. | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0 | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contact: [email protected] | ||
| */ | ||
|
|
||
| package org.eclipse.mosaic.fed.application.ambassador.simulation.electric.providers; | ||
|
|
||
| import org.eclipse.mosaic.fed.application.ambassador.simulation.electric.objects.ChargingStationObject; | ||
| import org.eclipse.mosaic.fed.application.ambassador.simulation.perception.index.objects.SpatialObjectAdapter; | ||
| import org.eclipse.mosaic.lib.geo.GeoCircle; | ||
| import org.eclipse.mosaic.lib.geo.GeoPoint; | ||
| import org.eclipse.mosaic.lib.objects.electricity.ChargingStationData; | ||
| import org.eclipse.mosaic.lib.spatial.KdTree; | ||
| import org.eclipse.mosaic.lib.spatial.SpatialTreeTraverser; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public class ChargingStationIndex { | ||
|
There was a problem hiding this comment. After merging Index and Tree, I think we should stick with naming "Tree". If I merge the two files from "Car extends Vehicle" then also what remains is rather a "Car" than a "Vehicle". |
||
|
|
||
| private final int bucketSize; | ||
|
|
||
| /** | ||
| * Stores {@link ChargingStationObject}s for fast removal and position update. | ||
| */ | ||
| final Map<String, ChargingStationObject> indexedChargingStations = new HashMap<>(); | ||
|
|
||
| private KdTree<ChargingStationObject> chargingStationTree; | ||
|
|
||
| private SpatialTreeTraverser.InRadius<ChargingStationObject> treeTraverser; | ||
|
|
||
| public ChargingStationIndex(int bucketSize) { | ||
| this.bucketSize = bucketSize; | ||
| } | ||
|
|
||
| /** | ||
| * Method called to initialize index after configuration has been read. | ||
| */ | ||
| public void initialize() { | ||
| // initialization at first update | ||
| } | ||
|
There was a problem hiding this comment. Why do we have this method if we don't do anything here? |
||
|
|
||
| public void addChargingStation(String id, GeoPoint position) { | ||
| indexedChargingStations.computeIfAbsent(id, ChargingStationObject::new) | ||
| .setPosition(position.toCartesian()); | ||
| } | ||
|
|
||
| /** | ||
| * Perform action before an update of the {@link ChargingStationIndex} takes place. | ||
| */ | ||
| public void updateChargingStation(ChargingStationData chargingStationData) { | ||
| onChargingStationUpdate(); | ||
| indexedChargingStations.get(chargingStationData.getName()) | ||
|
There was a problem hiding this comment. is there actually anything we want to update about charging stations? |
||
| .setChargingStationData(chargingStationData); | ||
| } | ||
|
|
||
| public List<ChargingStationObject>getChargingStationsInCircle(GeoCircle circle) { | ||
|
There was a problem hiding this comment. Code style: missing space before method name |
||
| treeTraverser.setup(circle.getCenter().toVector3d(), circle.getRadius()); | ||
| treeTraverser.traverse(chargingStationTree); | ||
| return treeTraverser.getResult(); | ||
| } | ||
|
|
||
| public void onChargingStationUpdate() { | ||
| if (chargingStationTree == null) { // initialize before first update is called | ||
| List<ChargingStationObject> allChargingStations = new ArrayList<>(indexedChargingStations.values()); | ||
| chargingStationTree = new KdTree<>(new SpatialObjectAdapter<>(), allChargingStations, bucketSize); | ||
| treeTraverser = new SpatialTreeTraverser.InRadius<>(); | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Does this need to be public? I would make that private, rename it to |
||
|
|
||
| public int getNumberOfChargingStations() { | ||
| return chargingStationTree.getRoot().size(); | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should not be necessary, please remove
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@iwillitried yes, there is another
.gitignorein mosaic-starter which ignores thelogsdirectory. That should suffice and you can remove the/logs/entry here.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is still not resolved!