migrate

Signed-off-by: Mamoru Sobue <[email protected]>
autowarefoundation · Aug 26, 2024 · 3f55410 · 3f55410
1 parent 699a273
commit 3f55410
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/autoware_lanelet2_extension/docs/extra_regulatory_elements.md b/autoware_lanelet2_extension/docs/extra_regulatory_elements.md
@@ -309,8 +309,7 @@ _An example:_
 
 ## Bus Stop Area
 
-The area tagged with `bus_stop_area` can be used to limit the pullover space for bus-like vehicles. This area is referred from the road or road_shoulder subtype lanelets where the destination is positioned via the `BusStopArea` regulatory element.
->>>>>>> beac7ef (feat(lanelet2_extension): docuement for bus_stop_area and bicycle_lane(format_version2))
+The `BusStopArea` regulatory element can be used to specify the available space for bus-like vehicles to stop at a bus stop. The regulatory element should refer to a polygon with the `bus_stop_area` type and should be referred by the `road` or `road_shoulder` subtype lanelets that overlaps with the target `bus_stop_area` polygon.
 
 ![BusStopArea tagging](bus_stop_area.drawio.svg)
 

diff --git a/autoware_lanelet2_extension/include/autoware_lanelet2_extension/version.hpp b/autoware_lanelet2_extension/include/autoware_lanelet2_extension/version.hpp
@@ -26,6 +26,7 @@ namespace lanelet::autoware
  */
 enum class Version : int {
   none = 0,
+  format_v1,
   format_v2,
 };