Merge remote-tracking branch 'origin/develop' into feat/limitation_by…

…_area
tier4 · Dec 23, 2024 · bae9f73 · bae9f73
2 parents cd1e5a2 + adcc317
commit bae9f73
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 30 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -38,7 +38,7 @@
     "${workspaceFolder}/../../../install/tier4_localization_msgs/local/lib/python3.10/dist-packages",
     "${workspaceFolder}/../../../install/tier4_api_msgs/local/lib/python3.10/dist-packages",
     "${workspaceFolder}/../../../install/tier4_perception_msgs/local/lib/python3.10/dist-packages",
-    "${workspaceFolder}/../../../install/lanelet2_extension_python/local/lib/python3.10/dist-packages",
+    "${workspaceFolder}/../../../install/autoware_lanelet2_extension_python/local/lib/python3.10/dist-packages",
     "${workspaceFolder}/../../../install/autoware_common_msgs/local/lib/python3.10/dist-packages",
     "${workspaceFolder}/../../../install/autoware_adapi_v1_msgs/local/lib/python3.10/dist-packages",
     "${workspaceFolder}/../../../install/tier4_metric_msgs/local/lib/python3.10/dist-packages"
@@ -57,7 +57,7 @@
     "${workspaceFolder}/../../../install/tier4_localization_msgs/local/lib/python3.10/dist-packages",
     "${workspaceFolder}/../../../install/tier4_api_msgs/local/lib/python3.10/dist-packages",
     "${workspaceFolder}/../../../install/tier4_perception_msgs/local/lib/python3.10/dist-packages",
-    "${workspaceFolder}/../../../install/lanelet2_extension_python/local/lib/python3.10/dist-packages",
+    "${workspaceFolder}/../../../install/autoware_lanelet2_extension_python/local/lib/python3.10/dist-packages",
     "${workspaceFolder}/../../../install/autoware_common_msgs/local/lib/python3.10/dist-packages",
     "${workspaceFolder}/../../../install/autoware_adapi_v1_msgs/local/lib/python3.10/dist-packages",
     "${workspaceFolder}/../../../install/tier4_metric_msgs/local/lib/python3.10/dist-packages"

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,13 @@
 # Release Notes
 
+## Version 3.1.0
+
+Major changes
+
+| Module | Feature | Brief summary                            | Pull request                                                   | Contributor                                   |
+| ------ | ------- | ---------------------------------------- | -------------------------------------------------------------- | --------------------------------------------- |
+| `all`  | library | use `autoware_lanelet2_extension_python` | [#586](https://github.com/tier4/driving_log_replayer/pull/586) | [hayato-m126](https://github.com/hayato-m126) |
+
 ## Version 3.0.2
 
 Minor Tweak
@@ -29,6 +37,14 @@ Major changes
 | `planning_control` | use case | add planning_control_evaluator | [#43](https://github.com/tier4/driving_log_replayer_v2/pull/43) | [hayato-m126](https://github.com/hayato-m126) |
 | `diagnostics`      | use case | add diagnostics_evaluator      | [#42](https://github.com/tier4/driving_log_replayer_v2/pull/42) | [hayato-m126](https://github.com/hayato-m126) |
 
+## Version 2.5.0
+
+Major changes
+
+| Module | Feature | Brief summary                            | Pull request                                                   | Jira     | Contributor                                   |
+| ------ | ------- | ---------------------------------------- | -------------------------------------------------------------- | -------- | --------------------------------------------- |
+| `all`  | library | use `autoware_lanelet2_extension_python` | [#586](https://github.com/tier4/driving_log_replayer/pull/586) | RT1-8898 | [hayato-m126](https://github.com/hayato-m126) |
+
 ## Version 2.4.0
 
 Major changes

diff --git a/dependency.repos b/dependency.repos
@@ -3,20 +3,15 @@ repositories:
   core/autoware_msgs:
     type: git
     url: https://github.com/autowarefoundation/autoware_msgs.git
-    version: 1.1.0
+    version: 1.3.0
   core/autoware_adapi_msgs:
     type: git
     url: https://github.com/autowarefoundation/autoware_adapi_msgs.git
-    version: 1.3.0
+    version: beta/1.7.0
   core/autoware_internal_msgs:
     type: git
     url: https://github.com/autowarefoundation/autoware_internal_msgs.git
     version: 1.1.0
-  # 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
@@ -28,7 +23,7 @@ repositories:
   core/autoware_lanelet2_extension:
     type: git
     url: https://github.com/autowarefoundation/autoware_lanelet2_extension.git
-    version: 0.6.1
+    version: 0.6.2
   # universe
   universe/external/tier4_autoware_msgs:
     type: git

diff --git a/driving_log_replayer_v2/CHANGELOG.rst b/driving_log_replayer_v2/CHANGELOG.rst
@@ -2,8 +2,25 @@
 Changelog for package driving_log_replayer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Forthcoming
------------
+3.1.0 (2024-12-20)
+------------------
+* Merge pull request `#70 <https://github.com/tier4/driving_log_replayer_v2/issues/70>`_ from tier4/feat/merge-autoware-lenelet2-extension
+  feat: merge autoware lenelet2 extension
+* Revert "feat: merge autoware lenelet2 extension (`#69 <https://github.com/tier4/driving_log_replayer_v2/issues/69>`_)"
+  This reverts commit c1e10d62f6c20878136b0d314e2d9f1c9c9a4520.
+* feat: merge autoware lenelet2 extension (`#69 <https://github.com/tier4/driving_log_replayer_v2/issues/69>`_)
+  * feat: no longer be maintained
+  * fix: update lanelet2 extension (`#586 <https://github.com/tier4/driving_log_replayer_v2/issues/586>`_)
+  * chore: release 2.5.0 (`#587 <https://github.com/tier4/driving_log_replayer_v2/issues/587>`_)
+  * 2.5.0
+  * fix: merge
+  ---------
+* fix: merge
+* Merge remote-tracking branch 'v1/main' into feat/merge-autoware-lenelet2-extension
+* Contributors: Hayato Mizushima
+
+3.0.2 (2024-12-19)
+------------------
 * fix: type hint (`#65 <https://github.com/tier4/driving_log_replayer_v2/issues/65>`_)
   * fix: type hint
   * fix: type hint
@@ -162,6 +179,11 @@ Forthcoming
   ---------
 * Contributors: Hayato Mizushima, iwatake
 
+2.5.0 (2024-12-19)
+------------------
+* fix: update lanelet2 extension (`#586 <https://github.com/tier4/driving_log_replayer/issues/586>`_)
+* Contributors: Hayato Mizushima
+
 2.4.0 (2024-11-20)
 ------------------
 * feat: add ground_segmentation_evaluator  (`#528 <https://github.com/tier4/driving_log_replayer/issues/528>`_)

diff --git a/driving_log_replayer_v2/driving_log_replayer_v2/lanelet2_util.py b/driving_log_replayer_v2/driving_log_replayer_v2/lanelet2_util.py
@@ -14,10 +14,10 @@
 
 from typing import Any
 
-import lanelet2
+import lanelet2  # isort:skip
+from autoware_lanelet2_extension_python.projection import MGRSProjector
+from autoware_lanelet2_extension_python.utility import query
 from lanelet2.core import Lanelet
-from lanelet2_extension_python.projection import MGRSProjector
-from lanelet2_extension_python.utility import query
 from shapely.geometry import Polygon
 
 
@@ -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))
 
 

diff --git a/driving_log_replayer_v2/package.xml b/driving_log_replayer_v2/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>driving_log_replayer_v2</name>
-  <version>3.0.1</version>
+  <version>3.1.0</version>
   <description>The driving_log_replayer_v2 package</description>
   <maintainer email="[email protected]">Hayato Mizushima</maintainer>
   <maintainer email="[email protected]">Kotaro Uetake</maintainer>
@@ -34,10 +34,10 @@
   <depend>tier4_metric_msgs</depend>
   <depend>visualization_msgs</depend>
 
+  <exec_depend>autoware_lanelet2_extension_python</exec_depend>
   <exec_depend>autoware_map_height_fitter</exec_depend>
   <exec_depend>component_state_monitor</exec_depend>
   <exec_depend>driving_log_replayer_v2_analyzer</exec_depend>
-  <exec_depend>lanelet2_extension_python</exec_depend>
   <exec_depend>perception_eval</exec_depend>
   <exec_depend>python3-fastjsonschema</exec_depend>
   <exec_depend>python3-pandas</exec_depend>

diff --git a/driving_log_replayer_v2/scripts/obstacle_segmentation_evaluator_node.py b/driving_log_replayer_v2/scripts/obstacle_segmentation_evaluator_node.py
@@ -19,12 +19,12 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+import lanelet2  # noqa # isort:skip
+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

diff --git a/driving_log_replayer_v2/test/unittest/test_lanelet2.py b/driving_log_replayer_v2/test/unittest/test_lanelet2.py
@@ -12,15 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import lanelet2  # noqa #isort:skip
+from autoware_lanelet2_extension_python.utility.query import getLaneletsWithinRange
 from geometry_msgs.msg import Point
-import lanelet2  # noqa
 from lanelet2.core import BasicPoint2d
 from lanelet2.core import getId
 from lanelet2.core import Lanelet
 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_v2.lanelet2_util import to_shapely_polygon
@@ -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)

diff --git a/driving_log_replayer_v2_analyzer/CHANGELOG.rst b/driving_log_replayer_v2_analyzer/CHANGELOG.rst
@@ -2,8 +2,11 @@
 Changelog for package driving_log_replayer_v2_analyzer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Forthcoming
------------
+3.1.0 (2024-12-20)
+------------------
+
+3.0.2 (2024-12-19)
+------------------
 
 3.0.1 (2024-12-13)
 ------------------

diff --git a/driving_log_replayer_v2_analyzer/package.xml b/driving_log_replayer_v2_analyzer/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>driving_log_replayer_v2_analyzer</name>
-  <version>3.0.1</version>
+  <version>3.1.0</version>
   <description>The driving_log_replayer_v2_analyzer package</description>
   <maintainer email="[email protected]">Hayato Mizushima</maintainer>
   <maintainer email="[email protected]">Keisuke Shima</maintainer>

diff --git a/driving_log_replayer_v2_msgs/CHANGELOG.rst b/driving_log_replayer_v2_msgs/CHANGELOG.rst
@@ -2,8 +2,11 @@
 Changelog for package driving_log_replayer_v2_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Forthcoming
------------
+3.1.0 (2024-12-20)
+------------------
+
+3.0.2 (2024-12-19)
+------------------
 
 3.0.1 (2024-12-13)
 ------------------

diff --git a/driving_log_replayer_v2_msgs/package.xml b/driving_log_replayer_v2_msgs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>driving_log_replayer_v2_msgs</name>
-  <version>3.0.1</version>
+  <version>3.1.0</version>
   <description>driving_log_replayer_v2 msgs</description>
   <maintainer email="[email protected]">Hayato Mizushima</maintainer>
   <license>Apache-2.0</license>

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "driving-log-replayer-v2"
-version = "3.0.2"
+version = "3.1.0"
 authors = [
   { name = "Hayato Mizushima", email = "[email protected]" },
   { name = "Kotaro Uetake", email = "[email protected]" },