From fd1cae1ca63100b17d88467b1836c04f2ded1eac Mon Sep 17 00:00:00 2001 From: yanjunbo <13008250033@163.com> Date: Sat, 5 Oct 2024 11:57:51 +0800 Subject: [PATCH] add length threshold for sidewalk generation --- mosstool/map/_map_util/const.py | 1 - mosstool/map/builder/builder.py | 6 +++++- pyproject.toml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mosstool/map/_map_util/const.py b/mosstool/map/_map_util/const.py index 8950e7d..569ea05 100644 --- a/mosstool/map/_map_util/const.py +++ b/mosstool/map/_map_util/const.py @@ -104,7 +104,6 @@ "BUS": 100, "SUBWAY": 180, } -MIN_HAS_WALK_LANE_LENGTH = 5 LARGE_LANE_NUM_THRESHOLD = 4 SMALL_LANE_NUM_THRESHOLD = 2 DEFAULT_TURN_NUM = { diff --git a/mosstool/map/builder/builder.py b/mosstool/map/builder/builder.py index 4d7644c..5d679e1 100644 --- a/mosstool/map/builder/builder.py +++ b/mosstool/map/builder/builder.py @@ -56,6 +56,7 @@ def __init__( traffic_light_min_direction_group: int = 3, default_lane_width: float = 3.2, gen_sidewalk_speed_limit: float = 0, + gen_sidewalk_length_limit: float = 5.0, expand_roads: bool = False, road_expand_mode: Union[Literal["L"], Literal["M"], Literal["R"]] = "R", aoi_mode: Union[Literal["append"], Literal["overwrite"]] = "overwrite", @@ -85,6 +86,7 @@ def __init__( - traffic_light_min_direction_group (int): minimum number of lane directions for traffic-light generation - default_lane_width (float): default lane width - gen_sidewalk_speed_limit (float): speed limit to generate sidewalk + - gen_sidewalk_speed_limit (float): length limit to generate sidewalk - expand_roads (bool): expand roads according to junction type - road_expand_mode (str): road expand mode - aoi_mode (str): aoi appending mode. `append` takes effect when the input `net` is Map, incrementally adding the input AOIs; `overwrite` only adds the input AOIs, ignoring existing ones. @@ -104,6 +106,7 @@ def __init__( self.public_transport = public_transport self.default_lane_width = default_lane_width self.gen_sidewalk_speed_limit = gen_sidewalk_speed_limit + self.gen_sidewalk_length_limit = gen_sidewalk_length_limit self.expand_roads = expand_roads self.road_expand_mode = road_expand_mode self.aoi_mode = aoi_mode @@ -1170,7 +1173,8 @@ def filter_way_ids(wids): self.map_roads[wid]["highway"] in HAS_WALK_LANES_HIGHWAY or self.map_roads[wid]["max_speed"] <= self.gen_sidewalk_speed_limit ) - and self.map_roads[wid]["lanes"][0].length >= MIN_HAS_WALK_LANE_LENGTH + and self.map_roads[wid]["lanes"][0].length + >= self.gen_sidewalk_length_limit ] def get_lane(wid): diff --git a/pyproject.toml b/pyproject.toml index 9516e09..36d846a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "mosstool" -version = "1.0.5" +version = "1.0.6" description = "MObility Simulation System toolbox " authors = ["Jun Zhang "] license = "MIT"