Skip to content
This repository has been archived by the owner on Nov 22, 2024. It is now read-only.

feat: update dependency.repos to clone renewal core repositories #497

Merged
merged 6 commits into from
Jul 27, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"${env:HOME}/ros_ws/awf/install/tier4_localization_msgs/local/lib/python3.10/dist-packages",
"${env:HOME}/ros_ws/awf/install/tier4_api_msgs/local/lib/python3.10/dist-packages",
"${env:HOME}/ros_ws/awf/install/tier4_perception_msgs/local/lib/python3.10/dist-packages",
"${env:HOME}/ros_ws/awf/install/lanelet2_extension_python/local/lib/python3.10/dist-packages",
"${env:HOME}/ros_ws/awf/install/autoware_lanelet2_extension_python/local/lib/python3.10/dist-packages",
"${env:HOME}/ros_ws/awf/install/autoware_common_msgs/local/lib/python3.10/dist-packages"
],
"python.analysis.extraPaths": [
Expand All @@ -55,7 +55,7 @@
"${env:HOME}/ros_ws/awf/install/tier4_localization_msgs/local/lib/python3.10/dist-packages",
"${env:HOME}/ros_ws/awf/install/tier4_api_msgs/local/lib/python3.10/dist-packages",
"${env:HOME}/ros_ws/awf/install/tier4_perception_msgs/local/lib/python3.10/dist-packages",
"${env:HOME}/ros_ws/awf/install/lanelet2_extension_python/local/lib/python3.10/dist-packages",
"${env:HOME}/ros_ws/awf/install/autoware_lanelet2_extension_python/local/lib/python3.10/dist-packages",
"${env:HOME}/ros_ws/awf/install/autoware_common_msgs/local/lib/python3.10/dist-packages"
],
"files.associations": {
Expand Down
13 changes: 13 additions & 0 deletions dependency.repos
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,22 @@ repositories:
type: git
url: https://github.com/autowarefoundation/autoware_adapi_msgs.git
version: main
# TODO(youtalk): Remove autoware_common when https://github.com/autowarefoundation/autoware/issues/4911 is closed
core/autoware_common:
type: git
url: https://github.com/autowarefoundation/autoware_common.git
version: remove-autoware-cmake-utils
core/autoware_cmake:
type: git
url: https://github.com/autowarefoundation/autoware_cmake.git
version: main
core/autoware_utils:
type: git
url: https://github.com/autowarefoundation/autoware_utils.git
version: main
core/autoware_lanelet2_extension:
type: git
url: https://github.com/autowarefoundation/autoware_lanelet2_extension.git
version: main
# universe
universe/external/tier4_autoware_msgs:
Expand Down
6 changes: 3 additions & 3 deletions driving_log_replayer/driving_log_replayer/lanelet2_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

from typing import Any

from autoware_lanelet2_extension_python.projection import MGRSProjector
from autoware_lanelet2_extension_python.utility import query
import lanelet2
from lanelet2.core import Lanelet
from lanelet2_extension_python.projection import MGRSProjector
from lanelet2_extension_python.utility import query
from shapely.geometry import Polygon


Expand All @@ -32,7 +32,7 @@ def load_all_lanelets(map_path: str) -> Any:


def road_lanelets_from_file(map_path: str) -> Any:
# return type lanelet2_extension_python._lanelet2_extension_python_boost_python_utility.lanelet::ConstLanelets
# return type autoware_lanelet2_extension_python._autoware_lanelet2_extension_python_boost_python_utility.lanelet::ConstLanelets
return query.roadLanelets(load_all_lanelets(map_path))


Expand Down
2 changes: 1 addition & 1 deletion driving_log_replayer/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<depend>tier4_localization_msgs</depend>
<depend>visualization_msgs</depend>

<exec_depend>autoware_lanelet2_extension_python</exec_depend>
<exec_depend>driving_log_replayer_analyzer</exec_depend>
<exec_depend>lanelet2_extension_python</exec_depend>
<exec_depend>perception_eval</exec_depend>
<exec_depend>python-transforms3d-pip</exec_depend>
<exec_depend>python3-pandas</exec_depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
from pathlib import Path
from typing import TYPE_CHECKING

from autoware_lanelet2_extension_python.utility.query import getLaneletsWithinRange
from diagnostic_msgs.msg import DiagnosticArray
from diagnostic_msgs.msg import DiagnosticStatus
from geometry_msgs.msg import PoseStamped
from geometry_msgs.msg import TransformStamped
import lanelet2 # noqa
from lanelet2_extension_python.utility.query import getLaneletsWithinRange
import numpy as np
from perception_eval.config import SensingEvaluationConfig
from perception_eval.manager import SensingEvaluationManager
Expand Down
4 changes: 2 additions & 2 deletions driving_log_replayer/test/unittest/test_lanelet2.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from autoware_lanelet2_extension_python.utility.query import getLaneletsWithinRange
from geometry_msgs.msg import Point
import lanelet2 # noqa
from lanelet2.core import BasicPoint2d
Expand All @@ -20,7 +21,6 @@
from lanelet2.core import LineString3d
from lanelet2.core import Point3d
from lanelet2.geometry import distance
from lanelet2_extension_python.utility.query import getLaneletsWithinRange
from shapely.geometry import Polygon

from driving_log_replayer.lanelet2_util import to_shapely_polygon
Expand Down Expand Up @@ -85,7 +85,7 @@ def test_calc_distance_point_to_lanelet() -> None:
lanelet_map = load_map(map_file)
re1504 = lanelet_map.regulatoryElementLayer.get(
1504,
) # lanelet2_extension_python._lanelet2_extension_python_boost_python_regulatory_elements.AutowareTrafficLight
) # autoware_lanelet2_extension_python._autoware_lanelet2_extension_python_boost_python_regulatory_elements.AutowareTrafficLight
distance_to_gt = []
for traffic_light in re1504.trafficLights:
l2d = to2D(traffic_light)
Expand Down
Loading