mirror of
https://github.com/a-b-street/abstreet.git
synced 2024-11-24 01:15:12 +03:00
deploy: 112a29625f
This commit is contained in:
dabreegster
parent
fb4e65bd88
commit
18e0fa3f6d
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 9.8 KiB |
@ -1686,11 +1686,11 @@ ends at a border or building, there are many combinations of these sequences.
|
||||
This is a way to categorize them into three groups. I'm not sure it's the
|
||||
simplest way to express all the state transitons.</p>
|
||||
<h2><a class="header" href="#walking-only-trips" id="walking-only-trips">Walking-only trips</a></h2>
|
||||
<p><img src="trafficsim/../mdbook-plantuml-img/37935669-3815-471f-829f-833681bb7718.svg" alt="../mdbook-plantuml-img/37935669-3815-471f-829f-833681bb7718.svg" /></p>
|
||||
<p><img src="trafficsim/../mdbook-plantuml-img/84f4c080-5d2e-4388-96a0-584376efe0b7.svg" alt="../mdbook-plantuml-img/84f4c080-5d2e-4388-96a0-584376efe0b7.svg" /></p>
|
||||
<h2><a class="header" href="#trips-starting-from-a-border" id="trips-starting-from-a-border">Trips starting from a border</a></h2>
|
||||
<p><img src="trafficsim/../mdbook-plantuml-img/37b94e8f-3c32-45f3-87b8-e4bc3f88689a.svg" alt="../mdbook-plantuml-img/37b94e8f-3c32-45f3-87b8-e4bc3f88689a.svg" /></p>
|
||||
<p><img src="trafficsim/../mdbook-plantuml-img/df56e9c8-bfb5-494a-b4bf-6173943b20bf.svg" alt="../mdbook-plantuml-img/df56e9c8-bfb5-494a-b4bf-6173943b20bf.svg" /></p>
|
||||
<h2><a class="header" href="#trips-starting-from-a-building" id="trips-starting-from-a-building">Trips starting from a building</a></h2>
|
||||
<p><img src="trafficsim/../mdbook-plantuml-img/8586d7e1-cd52-40ea-998d-07c4b29e7fc1.svg" alt="../mdbook-plantuml-img/8586d7e1-cd52-40ea-998d-07c4b29e7fc1.svg" /></p>
|
||||
<p><img src="trafficsim/../mdbook-plantuml-img/01d5ead0-cfd7-4fa7-aefb-2a5502b2dfdb.svg" alt="../mdbook-plantuml-img/01d5ead0-cfd7-4fa7-aefb-2a5502b2dfdb.svg" /></p>
|
||||
<h1><a class="header" href="#case-studies" id="case-studies">Case studies</a></h1>
|
||||
<p>Note: Most of these still aren't started, because the baseline simulation in the
|
||||
relevant area isn't working. Unknown traffic signal timing, bad guesses at the
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `BUILT_TIME_UTC` constant in crate `game`."><meta name="keywords" content="rust, rustlang, rust-lang, BUILT_TIME_UTC"><title>game::pregame::built_info::BUILT_TIME_UTC - Rust</title><link rel="stylesheet" type="text/css" href="../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../dark.css"><link rel="stylesheet" type="text/css" href="../../../light.css" id="themeStyle"><script src="../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../noscript.css"></noscript><link rel="shortcut icon" href="../../../favicon.ico"><style type="text/css">#crate-search{background-image:url("../../../down-arrow.svg");}</style></head><body class="rustdoc constant"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../game/index.html'><div class='logo-container'><img src='../../../rust-logo.png' alt='logo'></div></a><div class="sidebar-elems"><p class='location'><a href='../../index.html'>game</a>::<wbr><a href='../index.html'>pregame</a>::<wbr><a href='index.html'>built_info</a></p><script>window.sidebarCurrent = {name: 'BUILT_TIME_UTC', ty: 'constant', relpath: ''};</script><script defer src="sidebar-items.js"></script></div></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!"><img src="../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices"></div></div><script src="../../../theme.js"></script><nav class="sub"><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" disabled autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><a id="settings-menu" href="../../../settings.html"><img src="../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><h1 class='fqn'><span class='out-of-band'><span id='render-detail'><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class='inner'>−</span>]</a></span><a class='srclink' href='../../../src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-c6448dba6984e0e2/out/built.rs.html#49' title='goto source code'>[src]</a></span><span class='in-band'>Constant <a href='../../index.html'>game</a>::<wbr><a href='../index.html'>pregame</a>::<wbr><a href='index.html'>built_info</a>::<wbr><a class="constant" href=''>BUILT_TIME_UTC</a></span></h1><pre class='rust const'>pub const BUILT_TIME_UTC: &<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a> = "Tue, 25 Aug 2020 19:27:27 +0000";</pre><div class='docblock'><p>The built-time in RFC2822, UTC</p>
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `BUILT_TIME_UTC` constant in crate `game`."><meta name="keywords" content="rust, rustlang, rust-lang, BUILT_TIME_UTC"><title>game::pregame::built_info::BUILT_TIME_UTC - Rust</title><link rel="stylesheet" type="text/css" href="../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../dark.css"><link rel="stylesheet" type="text/css" href="../../../light.css" id="themeStyle"><script src="../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../noscript.css"></noscript><link rel="shortcut icon" href="../../../favicon.ico"><style type="text/css">#crate-search{background-image:url("../../../down-arrow.svg");}</style></head><body class="rustdoc constant"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../game/index.html'><div class='logo-container'><img src='../../../rust-logo.png' alt='logo'></div></a><div class="sidebar-elems"><p class='location'><a href='../../index.html'>game</a>::<wbr><a href='../index.html'>pregame</a>::<wbr><a href='index.html'>built_info</a></p><script>window.sidebarCurrent = {name: 'BUILT_TIME_UTC', ty: 'constant', relpath: ''};</script><script defer src="sidebar-items.js"></script></div></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!"><img src="../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices"></div></div><script src="../../../theme.js"></script><nav class="sub"><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" disabled autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><a id="settings-menu" href="../../../settings.html"><img src="../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><h1 class='fqn'><span class='out-of-band'><span id='render-detail'><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class='inner'>−</span>]</a></span><a class='srclink' href='../../../src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-c6448dba6984e0e2/out/built.rs.html#49' title='goto source code'>[src]</a></span><span class='in-band'>Constant <a href='../../index.html'>game</a>::<wbr><a href='../index.html'>pregame</a>::<wbr><a href='index.html'>built_info</a>::<wbr><a class="constant" href=''>BUILT_TIME_UTC</a></span></h1><pre class='rust const'>pub const BUILT_TIME_UTC: &<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a> = "Tue, 25 Aug 2020 21:20:39 +0000";</pre><div class='docblock'><p>The built-time in RFC2822, UTC</p>
|
||||
</div></section><section id="search" class="content hidden"></section><section class="footer"></section><script>window.rootPath = "../../../";window.currentCrate = "game";</script><script src="../../../main.js"></script><script defer src="../../../search-index.js"></script></body></html>
|
||||
File diff suppressed because one or more lines are too long
1
rustdoc/map_model/make/initial/lane_specs/fn.back.html
Normal file
1
rustdoc/map_model/make/initial/lane_specs/fn.back.html
Normal file
@ -0,0 +1 @@
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `back` fn in crate `map_model`."><meta name="keywords" content="rust, rustlang, rust-lang, back"><title>map_model::make::initial::lane_specs::back - Rust</title><link rel="stylesheet" type="text/css" href="../../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../../dark.css"><link rel="stylesheet" type="text/css" href="../../../../light.css" id="themeStyle"><script src="../../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../../noscript.css"></noscript><link rel="shortcut icon" href="../../../../favicon.ico"><style type="text/css">#crate-search{background-image:url("../../../../down-arrow.svg");}</style></head><body class="rustdoc fn"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../../map_model/index.html'><div class='logo-container'><img src='../../../../rust-logo.png' alt='logo'></div></a><div class="sidebar-elems"><p class='location'><a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a>::<wbr><a href='index.html'>lane_specs</a></p><script>window.sidebarCurrent = {name: 'back', ty: 'fn', relpath: ''};</script><script defer src="sidebar-items.js"></script></div></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!"><img src="../../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices"></div></div><script src="../../../../theme.js"></script><nav class="sub"><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" disabled autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><a id="settings-menu" href="../../../../settings.html"><img src="../../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><h1 class='fqn'><span class='out-of-band'><span id='render-detail'><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class='inner'>−</span>]</a></span><a class='srclink' href='../../../../src/map_model/make/initial/lane_specs.rs.html#26-36' title='goto source code'>[src]</a></span><span class='in-band'>Function <a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a>::<wbr><a href='index.html'>lane_specs</a>::<wbr><a class="fn" href=''>back</a></span></h1><pre class='rust fn'>fn back(lt: <a class="enum" href="../../../../map_model/enum.LaneType.html" title="enum map_model::LaneType">LaneType</a>) -> <a class="struct" href="../../../../map_model/make/initial/lane_specs/struct.LaneSpec.html" title="struct map_model::make::initial::lane_specs::LaneSpec">LaneSpec</a></pre></section><section id="search" class="content hidden"></section><section class="footer"></section><script>window.rootPath = "../../../../";window.currentCrate = "map_model";</script><script src="../../../../main.js"></script><script defer src="../../../../search-index.js"></script></body></html>
|
||||
1
rustdoc/map_model/make/initial/lane_specs/fn.fwd.html
Normal file
1
rustdoc/map_model/make/initial/lane_specs/fn.fwd.html
Normal file
@ -0,0 +1 @@
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `fwd` fn in crate `map_model`."><meta name="keywords" content="rust, rustlang, rust-lang, fwd"><title>map_model::make::initial::lane_specs::fwd - Rust</title><link rel="stylesheet" type="text/css" href="../../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../../dark.css"><link rel="stylesheet" type="text/css" href="../../../../light.css" id="themeStyle"><script src="../../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../../noscript.css"></noscript><link rel="shortcut icon" href="../../../../favicon.ico"><style type="text/css">#crate-search{background-image:url("../../../../down-arrow.svg");}</style></head><body class="rustdoc fn"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../../map_model/index.html'><div class='logo-container'><img src='../../../../rust-logo.png' alt='logo'></div></a><div class="sidebar-elems"><p class='location'><a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a>::<wbr><a href='index.html'>lane_specs</a></p><script>window.sidebarCurrent = {name: 'fwd', ty: 'fn', relpath: ''};</script><script defer src="sidebar-items.js"></script></div></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!"><img src="../../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices"></div></div><script src="../../../../theme.js"></script><nav class="sub"><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" disabled autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><a id="settings-menu" href="../../../../settings.html"><img src="../../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><h1 class='fqn'><span class='out-of-band'><span id='render-detail'><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class='inner'>−</span>]</a></span><a class='srclink' href='../../../../src/map_model/make/initial/lane_specs.rs.html#14-24' title='goto source code'>[src]</a></span><span class='in-band'>Function <a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a>::<wbr><a href='index.html'>lane_specs</a>::<wbr><a class="fn" href=''>fwd</a></span></h1><pre class='rust fn'>fn fwd(lt: <a class="enum" href="../../../../map_model/enum.LaneType.html" title="enum map_model::LaneType">LaneType</a>) -> <a class="struct" href="../../../../map_model/make/initial/lane_specs/struct.LaneSpec.html" title="struct map_model::make::initial::lane_specs::LaneSpec">LaneSpec</a></pre></section><section id="search" class="content hidden"></section><section class="footer"></section><script>window.rootPath = "../../../../";window.currentCrate = "map_model";</script><script src="../../../../main.js"></script><script defer src="../../../../search-index.js"></script></body></html>
|
||||
@ -1 +1 @@
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `get_lane_specs_ltr` fn in crate `map_model`."><meta name="keywords" content="rust, rustlang, rust-lang, get_lane_specs_ltr"><title>map_model::make::initial::lane_specs::get_lane_specs_ltr - Rust</title><link rel="stylesheet" type="text/css" href="../../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../../dark.css"><link rel="stylesheet" type="text/css" href="../../../../light.css" id="themeStyle"><script src="../../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../../noscript.css"></noscript><link rel="shortcut icon" href="../../../../favicon.ico"><style type="text/css">#crate-search{background-image:url("../../../../down-arrow.svg");}</style></head><body class="rustdoc fn"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../../map_model/index.html'><div class='logo-container'><img src='../../../../rust-logo.png' alt='logo'></div></a><div class="sidebar-elems"><p class='location'><a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a>::<wbr><a href='index.html'>lane_specs</a></p><script>window.sidebarCurrent = {name: 'get_lane_specs_ltr', ty: 'fn', relpath: ''};</script><script defer src="sidebar-items.js"></script></div></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!"><img src="../../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices"></div></div><script src="../../../../theme.js"></script><nav class="sub"><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" disabled autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><a id="settings-menu" href="../../../../settings.html"><img src="../../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><h1 class='fqn'><span class='out-of-band'><span id='render-detail'><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class='inner'>−</span>]</a></span><a class='srclink' href='../../../../src/map_model/make/initial/lane_specs.rs.html#51-280' title='goto source code'>[src]</a></span><span class='in-band'>Function <a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a>::<wbr><a href='index.html'>lane_specs</a>::<wbr><a class="fn" href=''>get_lane_specs_ltr</a></span></h1><pre class='rust fn'>pub fn get_lane_specs_ltr(tags: &<a class="struct" href="../../../../abstutil/collections/struct.Tags.html" title="struct abstutil::collections::Tags">Tags</a>) -> <a class="struct" href="https://doc.rust-lang.org/nightly/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a><<a class="struct" href="../../../../map_model/make/initial/lane_specs/struct.LaneSpec.html" title="struct map_model::make::initial::lane_specs::LaneSpec">LaneSpec</a>></pre></section><section id="search" class="content hidden"></section><section class="footer"></section><script>window.rootPath = "../../../../";window.currentCrate = "map_model";</script><script src="../../../../main.js"></script><script defer src="../../../../search-index.js"></script></body></html>
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `get_lane_specs_ltr` fn in crate `map_model`."><meta name="keywords" content="rust, rustlang, rust-lang, get_lane_specs_ltr"><title>map_model::make::initial::lane_specs::get_lane_specs_ltr - Rust</title><link rel="stylesheet" type="text/css" href="../../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../../dark.css"><link rel="stylesheet" type="text/css" href="../../../../light.css" id="themeStyle"><script src="../../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../../noscript.css"></noscript><link rel="shortcut icon" href="../../../../favicon.ico"><style type="text/css">#crate-search{background-image:url("../../../../down-arrow.svg");}</style></head><body class="rustdoc fn"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../../map_model/index.html'><div class='logo-container'><img src='../../../../rust-logo.png' alt='logo'></div></a><div class="sidebar-elems"><p class='location'><a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a>::<wbr><a href='index.html'>lane_specs</a></p><script>window.sidebarCurrent = {name: 'get_lane_specs_ltr', ty: 'fn', relpath: ''};</script><script defer src="sidebar-items.js"></script></div></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!"><img src="../../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices"></div></div><script src="../../../../theme.js"></script><nav class="sub"><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" disabled autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><a id="settings-menu" href="../../../../settings.html"><img src="../../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><h1 class='fqn'><span class='out-of-band'><span id='render-detail'><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class='inner'>−</span>]</a></span><a class='srclink' href='../../../../src/map_model/make/initial/lane_specs.rs.html#39-268' title='goto source code'>[src]</a></span><span class='in-band'>Function <a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a>::<wbr><a href='index.html'>lane_specs</a>::<wbr><a class="fn" href=''>get_lane_specs_ltr</a></span></h1><pre class='rust fn'>pub fn get_lane_specs_ltr(tags: &<a class="struct" href="../../../../abstutil/collections/struct.Tags.html" title="struct abstutil::collections::Tags">Tags</a>) -> <a class="struct" href="https://doc.rust-lang.org/nightly/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a><<a class="struct" href="../../../../map_model/make/initial/lane_specs/struct.LaneSpec.html" title="struct map_model::make::initial::lane_specs::LaneSpec">LaneSpec</a>></pre></section><section id="search" class="content hidden"></section><section class="footer"></section><script>window.rootPath = "../../../../";window.currentCrate = "map_model";</script><script src="../../../../main.js"></script><script defer src="../../../../search-index.js"></script></body></html>
|
||||
@ -1,3 +1,3 @@
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `lane_specs` mod in crate `map_model`."><meta name="keywords" content="rust, rustlang, rust-lang, lane_specs"><title>map_model::make::initial::lane_specs - Rust</title><link rel="stylesheet" type="text/css" href="../../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../../dark.css"><link rel="stylesheet" type="text/css" href="../../../../light.css" id="themeStyle"><script src="../../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../../noscript.css"></noscript><link rel="shortcut icon" href="../../../../favicon.ico"><style type="text/css">#crate-search{background-image:url("../../../../down-arrow.svg");}</style></head><body class="rustdoc mod"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../../map_model/index.html'><div class='logo-container'><img src='../../../../rust-logo.png' alt='logo'></div></a><p class='location'>Module lane_specs</p><div class="sidebar-elems"><div class="block items"><ul><li><a href="#structs">Structs</a></li><li><a href="#functions">Functions</a></li></ul></div><p class='location'><a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a></p><script>window.sidebarCurrent = {name: 'lane_specs', ty: 'mod', relpath: '../'};</script><script defer src="../sidebar-items.js"></script></div></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!"><img src="../../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices"></div></div><script src="../../../../theme.js"></script><nav class="sub"><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" disabled autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><a id="settings-menu" href="../../../../settings.html"><img src="../../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><h1 class='fqn'><span class='out-of-band'><span id='render-detail'><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class='inner'>−</span>]</a></span><a class='srclink' href='../../../../src/map_model/make/initial/lane_specs.rs.html#1-280' title='goto source code'>[src]</a></span><span class='in-band'>Module <a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a>::<wbr><a class="mod" href=''>lane_specs</a></span></h1><h2 id='structs' class='section-header'><a href="#structs">Structs</a></h2>
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `lane_specs` mod in crate `map_model`."><meta name="keywords" content="rust, rustlang, rust-lang, lane_specs"><title>map_model::make::initial::lane_specs - Rust</title><link rel="stylesheet" type="text/css" href="../../../../normalize.css"><link rel="stylesheet" type="text/css" href="../../../../rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="../../../../dark.css"><link rel="stylesheet" type="text/css" href="../../../../light.css" id="themeStyle"><script src="../../../../storage.js"></script><noscript><link rel="stylesheet" href="../../../../noscript.css"></noscript><link rel="shortcut icon" href="../../../../favicon.ico"><style type="text/css">#crate-search{background-image:url("../../../../down-arrow.svg");}</style></head><body class="rustdoc mod"><!--[if lte IE 8]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu">☰</div><a href='../../../../map_model/index.html'><div class='logo-container'><img src='../../../../rust-logo.png' alt='logo'></div></a><p class='location'>Module lane_specs</p><div class="sidebar-elems"><div class="block items"><ul><li><a href="#structs">Structs</a></li><li><a href="#functions">Functions</a></li></ul></div><p class='location'><a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a></p><script>window.sidebarCurrent = {name: 'lane_specs', ty: 'mod', relpath: '../'};</script><script defer src="../sidebar-items.js"></script></div></nav><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!"><img src="../../../../brush.svg" width="18" alt="Pick another theme!"></button><div id="theme-choices"></div></div><script src="../../../../theme.js"></script><nav class="sub"><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" disabled autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><a id="settings-menu" href="../../../../settings.html"><img src="../../../../wheel.svg" width="18" alt="Change settings"></a></div></form></nav><section id="main" class="content"><h1 class='fqn'><span class='out-of-band'><span id='render-detail'><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class='inner'>−</span>]</a></span><a class='srclink' href='../../../../src/map_model/make/initial/lane_specs.rs.html#1-268' title='goto source code'>[src]</a></span><span class='in-band'>Module <a href='../../../index.html'>map_model</a>::<wbr><a href='../../index.html'>make</a>::<wbr><a href='../index.html'>initial</a>::<wbr><a class="mod" href=''>lane_specs</a></span></h1><h2 id='structs' class='section-header'><a href="#structs">Structs</a></h2>
|
||||
<table><tr class='module-item'><td><a class="struct" href="struct.LaneSpec.html" title='map_model::make::initial::lane_specs::LaneSpec struct'>LaneSpec</a></td><td class='docblock-short'></td></tr></table><h2 id='functions' class='section-header'><a href="#functions">Functions</a></h2>
|
||||
<table><tr class='module-item'><td><a class="fn" href="fn.get_lane_specs_ltr.html" title='map_model::make::initial::lane_specs::get_lane_specs_ltr fn'>get_lane_specs_ltr</a></td><td class='docblock-short'></td></tr></table></section><section id="search" class="content hidden"></section><section class="footer"></section><script>window.rootPath = "../../../../";window.currentCrate = "map_model";</script><script src="../../../../main.js"></script><script defer src="../../../../search-index.js"></script></body></html>
|
||||
<table><tr class='module-item'><td><a class="fn" href="fn.back.html" title='map_model::make::initial::lane_specs::back fn'>back</a></td><td class='docblock-short'></td></tr><tr class='module-item'><td><a class="fn" href="fn.fwd.html" title='map_model::make::initial::lane_specs::fwd fn'>fwd</a></td><td class='docblock-short'></td></tr><tr class='module-item'><td><a class="fn" href="fn.get_lane_specs_ltr.html" title='map_model::make::initial::lane_specs::get_lane_specs_ltr fn'>get_lane_specs_ltr</a></td><td class='docblock-short'></td></tr></table></section><section id="search" class="content hidden"></section><section class="footer"></section><script>window.rootPath = "../../../../";window.currentCrate = "map_model";</script><script src="../../../../main.js"></script><script defer src="../../../../search-index.js"></script></body></html>
|
||||
@ -1 +1 @@
|
||||
initSidebarItems({"fn":[["get_lane_specs_ltr",""]],"struct":[["LaneSpec",""]]});
|
||||
initSidebarItems({"fn":[["back",""],["fwd",""],["get_lane_specs_ltr",""]],"struct":[["LaneSpec",""]]});
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -111,7 +111,7 @@
|
||||
<span class="doccomment">/// The output of `rustdoc -V`</span>
|
||||
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">RUSTDOC_VERSION</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"rustdoc 1.45.2 (d3fb005a3 2020-07-31)"</span>;
|
||||
<span class="doccomment">/// The built-time in RFC2822, UTC</span>
|
||||
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">BUILT_TIME_UTC</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"Tue, 25 Aug 2020 19:27:27 +0000"</span>;
|
||||
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">BUILT_TIME_UTC</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"Tue, 25 Aug 2020 21:20:39 +0000"</span>;
|
||||
<span class="doccomment">/// The target architecture, given by `cfg!(target_arch)`.</span>
|
||||
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">CFG_TARGET_ARCH</span>: <span class="kw-2">&</span><span class="ident">str</span> <span class="op">=</span> <span class="string">"x86_64"</span>;
|
||||
<span class="doccomment">/// The endianness, given by `cfg!(target_endian)`.</span>
|
||||
|
||||
@ -266,65 +266,41 @@
|
||||
<span id="266">266</span>
|
||||
<span id="267">267</span>
|
||||
<span id="268">268</span>
|
||||
<span id="269">269</span>
|
||||
<span id="270">270</span>
|
||||
<span id="271">271</span>
|
||||
<span id="272">272</span>
|
||||
<span id="273">273</span>
|
||||
<span id="274">274</span>
|
||||
<span id="275">275</span>
|
||||
<span id="276">276</span>
|
||||
<span id="277">277</span>
|
||||
<span id="278">278</span>
|
||||
<span id="279">279</span>
|
||||
<span id="280">280</span>
|
||||
</pre><div class="example-wrap"><pre class="rust ">
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::{<span class="ident">osm</span>, <span class="ident">LaneType</span>, <span class="ident">NORMAL_LANE_THICKNESS</span>, <span class="ident">SHOULDER_THICKNESS</span>, <span class="ident">SIDEWALK_THICKNESS</span>};
|
||||
<span class="kw">use</span> <span class="kw">crate</span>::{
|
||||
<span class="ident">osm</span>, <span class="ident">Direction</span>, <span class="ident">LaneType</span>, <span class="ident">NORMAL_LANE_THICKNESS</span>, <span class="ident">SHOULDER_THICKNESS</span>, <span class="ident">SIDEWALK_THICKNESS</span>,
|
||||
};
|
||||
<span class="kw">use</span> <span class="ident">abstutil</span>::<span class="ident">Tags</span>;
|
||||
<span class="kw">use</span> <span class="ident">geom</span>::<span class="ident">Distance</span>;
|
||||
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">iter</span>;
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">LaneSpec</span> {
|
||||
<span class="kw">pub</span> <span class="ident">lane_type</span>: <span class="ident">LaneType</span>,
|
||||
<span class="kw">pub</span> <span class="ident">reverse_pts</span>: <span class="ident">bool</span>,
|
||||
<span class="kw">pub</span> <span class="ident">lt</span>: <span class="ident">LaneType</span>,
|
||||
<span class="kw">pub</span> <span class="ident">dir</span>: <span class="ident">Direction</span>,
|
||||
<span class="kw">pub</span> <span class="ident">width</span>: <span class="ident">Distance</span>,
|
||||
}
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">LaneSpec</span> {
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">fwds</span>(<span class="ident">lane_type</span>: <span class="ident">LaneType</span>) <span class="op">-</span><span class="op">></span> <span class="ident">LaneSpec</span> {
|
||||
<span class="ident">LaneSpec</span> {
|
||||
<span class="ident">lane_type</span>,
|
||||
<span class="ident">reverse_pts</span>: <span class="bool-val">false</span>,
|
||||
<span class="ident">width</span>: <span class="kw">if</span> <span class="ident">lane_type</span> <span class="op">=</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Sidewalk</span> {
|
||||
<span class="ident">SIDEWALK_THICKNESS</span>
|
||||
} <span class="kw">else</span> {
|
||||
<span class="ident">NORMAL_LANE_THICKNESS</span>
|
||||
},
|
||||
}
|
||||
<span class="kw">fn</span> <span class="ident">fwd</span>(<span class="ident">lt</span>: <span class="ident">LaneType</span>) <span class="op">-</span><span class="op">></span> <span class="ident">LaneSpec</span> {
|
||||
<span class="ident">LaneSpec</span> {
|
||||
<span class="ident">lt</span>,
|
||||
<span class="ident">dir</span>: <span class="ident">Direction</span>::<span class="ident">Fwd</span>,
|
||||
<span class="ident">width</span>: <span class="kw">match</span> <span class="ident">lt</span> {
|
||||
<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span> <span class="op">=</span><span class="op">></span> <span class="ident">SIDEWALK_THICKNESS</span>,
|
||||
<span class="ident">LaneType</span>::<span class="ident">Shoulder</span> <span class="op">=</span><span class="op">></span> <span class="ident">SHOULDER_THICKNESS</span>,
|
||||
<span class="kw">_</span> <span class="op">=</span><span class="op">></span> <span class="ident">NORMAL_LANE_THICKNESS</span>,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">back</span>(<span class="ident">lane_type</span>: <span class="ident">LaneType</span>) <span class="op">-</span><span class="op">></span> <span class="ident">LaneSpec</span> {
|
||||
<span class="ident">LaneSpec</span> {
|
||||
<span class="ident">lane_type</span>,
|
||||
<span class="ident">reverse_pts</span>: <span class="bool-val">true</span>,
|
||||
<span class="ident">width</span>: <span class="kw">if</span> <span class="ident">lane_type</span> <span class="op">=</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Sidewalk</span> {
|
||||
<span class="ident">SIDEWALK_THICKNESS</span>
|
||||
} <span class="kw">else</span> {
|
||||
<span class="ident">NORMAL_LANE_THICKNESS</span>
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
<span class="kw">fn</span> <span class="ident">normal</span>(<span class="ident">fwd</span>: <span class="ident">Vec</span><span class="op"><</span><span class="ident">LaneType</span><span class="op">></span>, <span class="ident">back</span>: <span class="ident">Vec</span><span class="op"><</span><span class="ident">LaneType</span><span class="op">></span>) <span class="op">-</span><span class="op">></span> <span class="ident">Vec</span><span class="op"><</span><span class="ident">LaneSpec</span><span class="op">></span> {
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">specs</span>: <span class="ident">Vec</span><span class="op"><</span><span class="ident">LaneSpec</span><span class="op">></span> <span class="op">=</span> <span class="ident">Vec</span>::<span class="ident">new</span>();
|
||||
<span class="kw">for</span> <span class="ident">lt</span> <span class="kw">in</span> <span class="ident">back</span>.<span class="ident">into_iter</span>().<span class="ident">rev</span>() {
|
||||
<span class="ident">specs</span>.<span class="ident">push</span>(<span class="ident">LaneSpec</span>::<span class="ident">back</span>(<span class="ident">lt</span>));
|
||||
}
|
||||
<span class="kw">for</span> <span class="ident">lt</span> <span class="kw">in</span> <span class="ident">fwd</span> {
|
||||
<span class="ident">specs</span>.<span class="ident">push</span>(<span class="ident">LaneSpec</span>::<span class="ident">fwds</span>(<span class="ident">lt</span>));
|
||||
}
|
||||
<span class="macro">assert</span><span class="macro">!</span>(<span class="op">!</span><span class="ident">specs</span>.<span class="ident">is_empty</span>());
|
||||
<span class="ident">specs</span>
|
||||
<span class="kw">fn</span> <span class="ident">back</span>(<span class="ident">lt</span>: <span class="ident">LaneType</span>) <span class="op">-</span><span class="op">></span> <span class="ident">LaneSpec</span> {
|
||||
<span class="ident">LaneSpec</span> {
|
||||
<span class="ident">lt</span>,
|
||||
<span class="ident">dir</span>: <span class="ident">Direction</span>::<span class="ident">Back</span>,
|
||||
<span class="ident">width</span>: <span class="kw">match</span> <span class="ident">lt</span> {
|
||||
<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span> <span class="op">=</span><span class="op">></span> <span class="ident">SIDEWALK_THICKNESS</span>,
|
||||
<span class="ident">LaneType</span>::<span class="ident">Shoulder</span> <span class="op">=</span><span class="op">></span> <span class="ident">SHOULDER_THICKNESS</span>,
|
||||
<span class="kw">_</span> <span class="op">=</span><span class="op">></span> <span class="ident">NORMAL_LANE_THICKNESS</span>,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@ -332,10 +308,10 @@
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">get_lane_specs_ltr</span>(<span class="ident">tags</span>: <span class="kw-2">&</span><span class="ident">Tags</span>) <span class="op">-</span><span class="op">></span> <span class="ident">Vec</span><span class="op"><</span><span class="ident">LaneSpec</span><span class="op">></span> {
|
||||
<span class="comment">// Easy special cases first.</span>
|
||||
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is_any</span>(<span class="string">"railway"</span>, <span class="macro">vec</span><span class="macro">!</span>[<span class="string">"light_rail"</span>, <span class="string">"rail"</span>]) {
|
||||
<span class="kw">return</span> <span class="ident">LaneSpec</span>::<span class="ident">normal</span>(<span class="macro">vec</span><span class="macro">!</span>[<span class="ident">LaneType</span>::<span class="ident">LightRail</span>], <span class="ident">Vec</span>::<span class="ident">new</span>());
|
||||
<span class="kw">return</span> <span class="macro">vec</span><span class="macro">!</span>[<span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">LightRail</span>)];
|
||||
}
|
||||
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="ident">osm</span>::<span class="ident">HIGHWAY</span>, <span class="string">"footway"</span>) {
|
||||
<span class="kw">return</span> <span class="ident">LaneSpec</span>::<span class="ident">normal</span>(<span class="macro">vec</span><span class="macro">!</span>[<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>], <span class="ident">Vec</span>::<span class="ident">new</span>());
|
||||
<span class="kw">return</span> <span class="macro">vec</span><span class="macro">!</span>[<span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>)];
|
||||
}
|
||||
|
||||
<span class="comment">// TODO Reversible roads should be handled differently?</span>
|
||||
@ -402,15 +378,24 @@
|
||||
<span class="ident">LaneType</span>::<span class="ident">Driving</span>
|
||||
};
|
||||
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">fwd_side</span>: <span class="ident">Vec</span><span class="op"><</span><span class="ident">LaneType</span><span class="op">></span> <span class="op">=</span> <span class="ident">iter</span>::<span class="ident">repeat</span>(<span class="ident">driving_lane</span>).<span class="ident">take</span>(<span class="ident">num_driving_fwd</span>).<span class="ident">collect</span>();
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">back_side</span>: <span class="ident">Vec</span><span class="op"><</span><span class="ident">LaneType</span><span class="op">></span> <span class="op">=</span> <span class="ident">iter</span>::<span class="ident">repeat</span>(<span class="ident">driving_lane</span>).<span class="ident">take</span>(<span class="ident">num_driving_back</span>).<span class="ident">collect</span>();
|
||||
<span class="comment">// These are ordered from the road center, going outwards. Most of the members of fwd_side will</span>
|
||||
<span class="comment">// have Direction::Fwd, but there can be exceptions with two-way cycletracks.</span>
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">fwd_side</span>: <span class="ident">Vec</span><span class="op"><</span><span class="ident">LaneSpec</span><span class="op">></span> <span class="op">=</span> <span class="ident">iter</span>::<span class="ident">repeat_with</span>(<span class="op">|</span><span class="op">|</span> <span class="ident">fwd</span>(<span class="ident">driving_lane</span>))
|
||||
.<span class="ident">take</span>(<span class="ident">num_driving_fwd</span>)
|
||||
.<span class="ident">collect</span>();
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">back_side</span>: <span class="ident">Vec</span><span class="op"><</span><span class="ident">LaneSpec</span><span class="op">></span> <span class="op">=</span> <span class="ident">iter</span>::<span class="ident">repeat_with</span>(<span class="op">|</span><span class="op">|</span> <span class="ident">back</span>(<span class="ident">driving_lane</span>))
|
||||
.<span class="ident">take</span>(<span class="ident">num_driving_back</span>)
|
||||
.<span class="ident">collect</span>();
|
||||
<span class="comment">// TODO Fix upstream. https://wiki.openstreetmap.org/wiki/Key:centre_turn_lane</span>
|
||||
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="string">"lanes:both_ways"</span>, <span class="string">"1"</span>) <span class="op">|</span><span class="op">|</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="string">"centre_turn_lane"</span>, <span class="string">"yes"</span>) {
|
||||
<span class="ident">fwd_side</span>.<span class="ident">insert</span>(<span class="number">0</span>, <span class="ident">LaneType</span>::<span class="ident">SharedLeftTurn</span>);
|
||||
<span class="ident">fwd_side</span>.<span class="ident">insert</span>(<span class="number">0</span>, <span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">SharedLeftTurn</span>));
|
||||
}
|
||||
|
||||
<span class="kw">if</span> <span class="ident">driving_lane</span> <span class="op">=</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Construction</span> {
|
||||
<span class="kw">return</span> <span class="ident">LaneSpec</span>::<span class="ident">normal</span>(<span class="ident">fwd_side</span>, <span class="ident">back_side</span>);
|
||||
<span class="comment">// Assemble left-to-right</span>
|
||||
<span class="ident">back_side</span>.<span class="ident">reverse</span>();
|
||||
<span class="ident">back_side</span>.<span class="ident">extend</span>(<span class="ident">fwd_side</span>);
|
||||
<span class="kw">return</span> <span class="ident">back_side</span>;
|
||||
}
|
||||
|
||||
<span class="kw">let</span> <span class="ident">fwd_bus_spec</span> <span class="op">=</span> <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">s</span>) <span class="op">=</span> <span class="ident">tags</span>.<span class="ident">get</span>(<span class="string">"bus:lanes:forward"</span>) {
|
||||
@ -430,7 +415,7 @@
|
||||
};
|
||||
{
|
||||
<span class="kw">let</span> <span class="ident">parts</span>: <span class="ident">Vec</span><span class="op"><</span><span class="kw-2">&</span><span class="ident">str</span><span class="op">></span> <span class="op">=</span> <span class="ident">fwd_bus_spec</span>.<span class="ident">split</span>(<span class="string">"|"</span>).<span class="ident">collect</span>();
|
||||
<span class="kw">let</span> <span class="ident">offset</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">fwd_side</span>[<span class="number">0</span>] <span class="op">=</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">SharedLeftTurn</span> {
|
||||
<span class="kw">let</span> <span class="ident">offset</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">fwd_side</span>[<span class="number">0</span>].<span class="ident">lt</span> <span class="op">=</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">SharedLeftTurn</span> {
|
||||
<span class="number">1</span>
|
||||
} <span class="kw">else</span> {
|
||||
<span class="number">0</span>
|
||||
@ -438,7 +423,7 @@
|
||||
<span class="kw">if</span> <span class="ident">parts</span>.<span class="ident">len</span>() <span class="op">=</span><span class="op">=</span> <span class="ident">fwd_side</span>.<span class="ident">len</span>() <span class="op">-</span> <span class="ident">offset</span> {
|
||||
<span class="kw">for</span> (<span class="ident">idx</span>, <span class="ident">part</span>) <span class="kw">in</span> <span class="ident">parts</span>.<span class="ident">into_iter</span>().<span class="ident">enumerate</span>() {
|
||||
<span class="kw">if</span> <span class="ident">part</span> <span class="op">=</span><span class="op">=</span> <span class="string">"designated"</span> {
|
||||
<span class="ident">fwd_side</span>[<span class="ident">idx</span> <span class="op">+</span> <span class="ident">offset</span>] <span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Bus</span>;
|
||||
<span class="ident">fwd_side</span>[<span class="ident">idx</span> <span class="op">+</span> <span class="ident">offset</span>].<span class="ident">lt</span> <span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Bus</span>;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -451,38 +436,38 @@
|
||||
<span class="kw">if</span> <span class="ident">parts</span>.<span class="ident">len</span>() <span class="op">=</span><span class="op">=</span> <span class="ident">back_side</span>.<span class="ident">len</span>() {
|
||||
<span class="kw">for</span> (<span class="ident">idx</span>, <span class="ident">part</span>) <span class="kw">in</span> <span class="ident">parts</span>.<span class="ident">into_iter</span>().<span class="ident">enumerate</span>() {
|
||||
<span class="kw">if</span> <span class="ident">part</span> <span class="op">=</span><span class="op">=</span> <span class="string">"designated"</span> {
|
||||
<span class="ident">back_side</span>[<span class="ident">idx</span>] <span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Bus</span>;
|
||||
<span class="ident">back_side</span>[<span class="ident">idx</span>].<span class="ident">lt</span> <span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Bus</span>;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is_any</span>(<span class="string">"cycleway"</span>, <span class="macro">vec</span><span class="macro">!</span>[<span class="string">"lane"</span>, <span class="string">"track"</span>]) {
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>);
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>));
|
||||
<span class="kw">if</span> <span class="op">!</span><span class="ident">back_side</span>.<span class="ident">is_empty</span>() {
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>);
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">back</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>));
|
||||
}
|
||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is_any</span>(<span class="string">"cycleway:both"</span>, <span class="macro">vec</span><span class="macro">!</span>[<span class="string">"lane"</span>, <span class="string">"track"</span>]) {
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>);
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>);
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>));
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">back</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>));
|
||||
} <span class="kw">else</span> {
|
||||
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is_any</span>(<span class="string">"cycleway:right"</span>, <span class="macro">vec</span><span class="macro">!</span>[<span class="string">"lane"</span>, <span class="string">"track"</span>]) {
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>);
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>));
|
||||
}
|
||||
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="string">"cycleway:left"</span>, <span class="string">"opposite_lane"</span>) <span class="op">|</span><span class="op">|</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="string">"cycleway"</span>, <span class="string">"opposite_lane"</span>) {
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>);
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">back</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>));
|
||||
}
|
||||
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is_any</span>(<span class="string">"cycleway:left"</span>, <span class="macro">vec</span><span class="macro">!</span>[<span class="string">"lane"</span>, <span class="string">"track"</span>]) {
|
||||
<span class="kw">if</span> <span class="ident">oneway</span> {
|
||||
<span class="ident">fwd_side</span>.<span class="ident">insert</span>(<span class="number">0</span>, <span class="ident">LaneType</span>::<span class="ident">Biking</span>);
|
||||
<span class="ident">fwd_side</span>.<span class="ident">insert</span>(<span class="number">0</span>, <span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>));
|
||||
} <span class="kw">else</span> {
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>);
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">back</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>));
|
||||
}
|
||||
}
|
||||
|
||||
<span class="comment">// Cycleway isn't explicitly specified, but this is a reasonable assumption anyway.</span>
|
||||
<span class="kw">if</span> <span class="ident">back_side</span>.<span class="ident">is_empty</span>() <span class="kw-2">&</span><span class="op">&</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="string">"oneway:bicycle"</span>, <span class="string">"no"</span>) {
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>);
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">back</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>));
|
||||
}
|
||||
}
|
||||
|
||||
@ -493,35 +478,35 @@
|
||||
<span class="kw">let</span> <span class="ident">parking_lane_back</span> <span class="op">=</span> <span class="ident">tags</span>.<span class="ident">is_any</span>(<span class="ident">osm</span>::<span class="ident">PARKING_LEFT</span>, <span class="ident">has_parking</span>.<span class="ident">clone</span>())
|
||||
<span class="op">|</span><span class="op">|</span> <span class="ident">tags</span>.<span class="ident">is_any</span>(<span class="ident">osm</span>::<span class="ident">PARKING_BOTH</span>, <span class="ident">has_parking</span>);
|
||||
<span class="kw">if</span> <span class="ident">parking_lane_fwd</span> {
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Parking</span>);
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Parking</span>));
|
||||
}
|
||||
<span class="kw">if</span> <span class="ident">parking_lane_back</span> {
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Parking</span>);
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">back</span>(<span class="ident">LaneType</span>::<span class="ident">Parking</span>));
|
||||
}
|
||||
}
|
||||
|
||||
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="ident">osm</span>::<span class="ident">SIDEWALK</span>, <span class="string">"both"</span>) {
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>);
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>);
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>));
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">back</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>));
|
||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="ident">osm</span>::<span class="ident">SIDEWALK</span>, <span class="string">"separate"</span>) {
|
||||
<span class="comment">// TODO Need to snap separate sidewalks to ways. Until then, just do this.</span>
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>);
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>));
|
||||
<span class="kw">if</span> <span class="op">!</span><span class="ident">back_side</span>.<span class="ident">is_empty</span>() {
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>);
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">back</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>));
|
||||
}
|
||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="ident">osm</span>::<span class="ident">SIDEWALK</span>, <span class="string">"right"</span>) {
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>);
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>));
|
||||
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="ident">osm</span>::<span class="ident">SIDEWALK</span>, <span class="string">"left"</span>) {
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>);
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">back</span>(<span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>));
|
||||
}
|
||||
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">need_fwd_shoulder</span> <span class="op">=</span> <span class="ident">fwd_side</span>
|
||||
.<span class="ident">last</span>()
|
||||
.<span class="ident">map</span>(<span class="op">|</span><span class="ident">lt</span><span class="op">|</span> <span class="kw-2">*</span><span class="ident">lt</span> <span class="op">!</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>)
|
||||
.<span class="ident">map</span>(<span class="op">|</span><span class="ident">spec</span><span class="op">|</span> <span class="ident">spec</span>.<span class="ident">lt</span> <span class="op">!</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>)
|
||||
.<span class="ident">unwrap_or</span>(<span class="bool-val">true</span>);
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">need_back_shoulder</span> <span class="op">=</span> <span class="ident">back_side</span>
|
||||
.<span class="ident">last</span>()
|
||||
.<span class="ident">map</span>(<span class="op">|</span><span class="ident">lt</span><span class="op">|</span> <span class="kw-2">*</span><span class="ident">lt</span> <span class="op">!</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>)
|
||||
.<span class="ident">map</span>(<span class="op">|</span><span class="ident">spec</span><span class="op">|</span> <span class="ident">spec</span>.<span class="ident">lt</span> <span class="op">!</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Sidewalk</span>)
|
||||
.<span class="ident">unwrap_or</span>(<span class="bool-val">true</span>);
|
||||
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is_any</span>(
|
||||
<span class="ident">osm</span>::<span class="ident">HIGHWAY</span>,
|
||||
@ -538,26 +523,17 @@
|
||||
<span class="ident">need_back_shoulder</span> <span class="op">=</span> <span class="bool-val">false</span>;
|
||||
}
|
||||
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">specs</span> <span class="op">=</span> <span class="ident">LaneSpec</span>::<span class="ident">normal</span>(<span class="ident">fwd_side</span>, <span class="ident">back_side</span>);
|
||||
<span class="kw">if</span> <span class="ident">need_fwd_shoulder</span> {
|
||||
<span class="ident">specs</span>.<span class="ident">push</span>(<span class="ident">LaneSpec</span> {
|
||||
<span class="ident">lane_type</span>: <span class="ident">LaneType</span>::<span class="ident">Shoulder</span>,
|
||||
<span class="ident">reverse_pts</span>: <span class="bool-val">false</span>,
|
||||
<span class="ident">width</span>: <span class="ident">SHOULDER_THICKNESS</span>,
|
||||
});
|
||||
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Shoulder</span>));
|
||||
}
|
||||
<span class="kw">if</span> <span class="ident">need_back_shoulder</span> {
|
||||
<span class="ident">specs</span>.<span class="ident">insert</span>(
|
||||
<span class="number">0</span>,
|
||||
<span class="ident">LaneSpec</span> {
|
||||
<span class="ident">lane_type</span>: <span class="ident">LaneType</span>::<span class="ident">Shoulder</span>,
|
||||
<span class="ident">reverse_pts</span>: <span class="bool-val">true</span>,
|
||||
<span class="ident">width</span>: <span class="ident">SHOULDER_THICKNESS</span>,
|
||||
},
|
||||
);
|
||||
<span class="ident">back_side</span>.<span class="ident">push</span>(<span class="ident">back</span>(<span class="ident">LaneType</span>::<span class="ident">Shoulder</span>));
|
||||
}
|
||||
|
||||
<span class="ident">specs</span>
|
||||
<span class="comment">// Assemble left-to-right</span>
|
||||
<span class="ident">back_side</span>.<span class="ident">reverse</span>();
|
||||
<span class="ident">back_side</span>.<span class="ident">extend</span>(<span class="ident">fwd_side</span>);
|
||||
<span class="ident">back_side</span>
|
||||
}
|
||||
</pre></div>
|
||||
</section><section id="search" class="content hidden"></section><section class="footer"></section><script>window.rootPath = "../../../../";window.currentCrate = "map_model";</script><script src="../../../../main.js"></script><script src="../../../../source-script.js"></script><script src="../../../../source-files.js"></script><script defer src="../../../../search-index.js"></script></body></html>
|
||||
@ -551,7 +551,7 @@
|
||||
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">total_back_width</span> <span class="op">=</span> <span class="ident">Distance</span>::<span class="ident">ZERO</span>;
|
||||
<span class="kw">for</span> <span class="ident">lane</span> <span class="kw">in</span> <span class="kw-2">&</span><span class="ident">r</span>.<span class="ident">lane_specs_ltr</span> {
|
||||
<span class="kw">if</span> <span class="ident">lane</span>.<span class="ident">reverse_pts</span> {
|
||||
<span class="kw">if</span> <span class="ident">lane</span>.<span class="ident">dir</span> <span class="op">=</span><span class="op">=</span> <span class="ident">Direction</span>::<span class="ident">Back</span> {
|
||||
<span class="ident">total_back_width</span> <span class="op">+</span><span class="op">=</span> <span class="ident">lane</span>.<span class="ident">width</span>;
|
||||
}
|
||||
}
|
||||
@ -565,19 +565,15 @@
|
||||
<span class="kw">for</span> <span class="ident">lane</span> <span class="kw">in</span> <span class="kw-2">&</span><span class="ident">r</span>.<span class="ident">lane_specs_ltr</span> {
|
||||
<span class="kw">let</span> <span class="ident">id</span> <span class="op">=</span> <span class="ident">LaneID</span>(<span class="ident">map</span>.<span class="ident">lanes</span>.<span class="ident">len</span>());
|
||||
|
||||
<span class="kw">let</span> (<span class="ident">src_i</span>, <span class="ident">dst_i</span>) <span class="op">=</span> <span class="kw">if</span> <span class="ident">lane</span>.<span class="ident">reverse_pts</span> { (<span class="ident">i2</span>, <span class="ident">i1</span>) } <span class="kw">else</span> { (<span class="ident">i1</span>, <span class="ident">i2</span>) };
|
||||
<span class="kw">let</span> (<span class="ident">src_i</span>, <span class="ident">dst_i</span>) <span class="op">=</span> <span class="kw">if</span> <span class="ident">lane</span>.<span class="ident">dir</span> <span class="op">=</span><span class="op">=</span> <span class="ident">Direction</span>::<span class="ident">Fwd</span> {
|
||||
(<span class="ident">i1</span>, <span class="ident">i2</span>)
|
||||
} <span class="kw">else</span> {
|
||||
(<span class="ident">i2</span>, <span class="ident">i1</span>)
|
||||
};
|
||||
<span class="ident">map</span>.<span class="ident">intersections</span>[<span class="ident">src_i</span>.<span class="number">0</span>].<span class="ident">outgoing_lanes</span>.<span class="ident">push</span>(<span class="ident">id</span>);
|
||||
<span class="ident">map</span>.<span class="ident">intersections</span>[<span class="ident">dst_i</span>.<span class="number">0</span>].<span class="ident">incoming_lanes</span>.<span class="ident">push</span>(<span class="ident">id</span>);
|
||||
|
||||
<span class="ident">road</span>.<span class="ident">lanes_ltr</span>.<span class="ident">push</span>((
|
||||
<span class="ident">id</span>,
|
||||
<span class="kw">if</span> <span class="ident">lane</span>.<span class="ident">reverse_pts</span> {
|
||||
<span class="ident">Direction</span>::<span class="ident">Back</span>
|
||||
} <span class="kw">else</span> {
|
||||
<span class="ident">Direction</span>::<span class="ident">Fwd</span>
|
||||
},
|
||||
<span class="ident">lane</span>.<span class="ident">lane_type</span>,
|
||||
));
|
||||
<span class="ident">road</span>.<span class="ident">lanes_ltr</span>.<span class="ident">push</span>((<span class="ident">id</span>, <span class="ident">lane</span>.<span class="ident">dir</span>, <span class="ident">lane</span>.<span class="ident">lt</span>));
|
||||
|
||||
<span class="kw">let</span> <span class="ident">pl</span> <span class="op">=</span> <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="ident">pl</span>) <span class="op">=</span>
|
||||
<span class="ident">map</span>.<span class="ident">right_shift</span>(<span class="ident">road_left_pts</span>.<span class="ident">clone</span>(), <span class="ident">width_so_far</span> <span class="op">+</span> (<span class="ident">lane</span>.<span class="ident">width</span> <span class="op">/</span> <span class="number">2.0</span>))
|
||||
@ -587,7 +583,11 @@
|
||||
<span class="ident">timer</span>.<span class="ident">error</span>(<span class="macro">format</span><span class="macro">!</span>(<span class="string">"{} geometry broken; lane not shifted!"</span>, <span class="ident">id</span>));
|
||||
<span class="ident">road_left_pts</span>.<span class="ident">clone</span>()
|
||||
};
|
||||
<span class="kw">let</span> <span class="ident">lane_center_pts</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">lane</span>.<span class="ident">reverse_pts</span> { <span class="ident">pl</span>.<span class="ident">reversed</span>() } <span class="kw">else</span> { <span class="ident">pl</span> };
|
||||
<span class="kw">let</span> <span class="ident">lane_center_pts</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">lane</span>.<span class="ident">dir</span> <span class="op">=</span><span class="op">=</span> <span class="ident">Direction</span>::<span class="ident">Fwd</span> {
|
||||
<span class="ident">pl</span>
|
||||
} <span class="kw">else</span> {
|
||||
<span class="ident">pl</span>.<span class="ident">reversed</span>()
|
||||
};
|
||||
<span class="ident">width_so_far</span> <span class="op">+</span><span class="op">=</span> <span class="ident">lane</span>.<span class="ident">width</span>;
|
||||
|
||||
<span class="ident">map</span>.<span class="ident">lanes</span>.<span class="ident">push</span>(<span class="ident">Lane</span> {
|
||||
@ -596,7 +596,7 @@
|
||||
<span class="ident">width</span>: <span class="ident">lane</span>.<span class="ident">width</span>,
|
||||
<span class="ident">src_i</span>,
|
||||
<span class="ident">dst_i</span>,
|
||||
<span class="ident">lane_type</span>: <span class="ident">lane</span>.<span class="ident">lane_type</span>,
|
||||
<span class="ident">lane_type</span>: <span class="ident">lane</span>.<span class="ident">lt</span>,
|
||||
<span class="ident">parent</span>: <span class="ident">road_id</span>,
|
||||
<span class="ident">bus_stops</span>: <span class="ident">BTreeSet</span>::<span class="ident">new</span>(),
|
||||
<span class="ident">driving_blackhole</span>: <span class="bool-val">false</span>,
|
||||
|
||||
@ -688,8 +688,8 @@
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">sidewalk_left</span> <span class="op">=</span> <span class="prelude-val">None</span>;
|
||||
<span class="kw">for</span> <span class="ident">l</span> <span class="kw">in</span> <span class="kw-2">&</span><span class="ident">lane_specs</span> {
|
||||
<span class="ident">total_width</span> <span class="op">+</span><span class="op">=</span> <span class="ident">l</span>.<span class="ident">width</span>;
|
||||
<span class="kw">if</span> <span class="ident">l</span>.<span class="ident">lane_type</span> <span class="op">=</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Sidewalk</span> <span class="op">|</span><span class="op">|</span> <span class="ident">l</span>.<span class="ident">lane_type</span> <span class="op">=</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Shoulder</span> {
|
||||
<span class="kw">if</span> <span class="ident">l</span>.<span class="ident">reverse_pts</span> {
|
||||
<span class="kw">if</span> <span class="ident">l</span>.<span class="ident">lt</span> <span class="op">=</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Sidewalk</span> <span class="op">|</span><span class="op">|</span> <span class="ident">l</span>.<span class="ident">lt</span> <span class="op">=</span><span class="op">=</span> <span class="ident">LaneType</span>::<span class="ident">Shoulder</span> {
|
||||
<span class="kw">if</span> <span class="ident">l</span>.<span class="ident">dir</span> <span class="op">=</span><span class="op">=</span> <span class="ident">Direction</span>::<span class="ident">Back</span> {
|
||||
<span class="ident">sidewalk_left</span> <span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">l</span>.<span class="ident">width</span>);
|
||||
} <span class="kw">else</span> {
|
||||
<span class="ident">sidewalk_right</span> <span class="op">=</span> <span class="prelude-val">Some</span>(<span class="ident">l</span>.<span class="ident">width</span>);
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -154,11 +154,11 @@ ends at a border or building, there are many combinations of these sequences.
|
||||
This is a way to categorize them into three groups. I'm not sure it's the
|
||||
simplest way to express all the state transitons.</p>
|
||||
<h2><a class="header" href="#walking-only-trips" id="walking-only-trips">Walking-only trips</a></h2>
|
||||
<p><img src="../mdbook-plantuml-img/37935669-3815-471f-829f-833681bb7718.svg" alt="../mdbook-plantuml-img/37935669-3815-471f-829f-833681bb7718.svg" /></p>
|
||||
<p><img src="../mdbook-plantuml-img/84f4c080-5d2e-4388-96a0-584376efe0b7.svg" alt="../mdbook-plantuml-img/84f4c080-5d2e-4388-96a0-584376efe0b7.svg" /></p>
|
||||
<h2><a class="header" href="#trips-starting-from-a-border" id="trips-starting-from-a-border">Trips starting from a border</a></h2>
|
||||
<p><img src="../mdbook-plantuml-img/37b94e8f-3c32-45f3-87b8-e4bc3f88689a.svg" alt="../mdbook-plantuml-img/37b94e8f-3c32-45f3-87b8-e4bc3f88689a.svg" /></p>
|
||||
<p><img src="../mdbook-plantuml-img/df56e9c8-bfb5-494a-b4bf-6173943b20bf.svg" alt="../mdbook-plantuml-img/df56e9c8-bfb5-494a-b4bf-6173943b20bf.svg" /></p>
|
||||
<h2><a class="header" href="#trips-starting-from-a-building" id="trips-starting-from-a-building">Trips starting from a building</a></h2>
|
||||
<p><img src="../mdbook-plantuml-img/8586d7e1-cd52-40ea-998d-07c4b29e7fc1.svg" alt="../mdbook-plantuml-img/8586d7e1-cd52-40ea-998d-07c4b29e7fc1.svg" /></p>
|
||||
<p><img src="../mdbook-plantuml-img/01d5ead0-cfd7-4fa7-aefb-2a5502b2dfdb.svg" alt="../mdbook-plantuml-img/01d5ead0-cfd7-4fa7-aefb-2a5502b2dfdb.svg" /></p>
|
||||
|
||||
</main>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user