This commit is contained in:
dabreegster 2020-08-25 23:54:22 +00:00
parent 2fc1c86d77
commit 5c44a9e164
15 changed files with 103 additions and 17 deletions

View File

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

View File

@ -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/532142eb-d6a9-4a9d-bc2c-3acb1f7260ee.svg" alt="../mdbook-plantuml-img/532142eb-d6a9-4a9d-bc2c-3acb1f7260ee.svg" /></p>
<p><img src="trafficsim/../mdbook-plantuml-img/3d307c2e-7e70-4136-b049-98681b939bd4.svg" alt="../mdbook-plantuml-img/3d307c2e-7e70-4136-b049-98681b939bd4.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/f0e6141b-c488-4d4a-9a68-0b5706ab7f23.svg" alt="../mdbook-plantuml-img/f0e6141b-c488-4d4a-9a68-0b5706ab7f23.svg" /></p>
<p><img src="trafficsim/../mdbook-plantuml-img/e72caed5-65bd-4394-9413-1684112920fe.svg" alt="../mdbook-plantuml-img/e72caed5-65bd-4394-9413-1684112920fe.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/e83934cb-b52f-4273-89ed-1e1213eb6111.svg" alt="../mdbook-plantuml-img/e83934cb-b52f-4273-89ed-1e1213eb6111.svg" /></p>
<p><img src="trafficsim/../mdbook-plantuml-img/c5f89c46-6a55-40b4-844c-6baa5ae5b1d0.svg" alt="../mdbook-plantuml-img/c5f89c46-6a55-40b4-844c-6baa5ae5b1d0.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

View File

@ -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">&#9776;</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'>&#x2212;</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: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a> = &quot;Tue, 25 Aug 2020 22:41:49 +0000&quot;;</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">&#9776;</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'>&#x2212;</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: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a> = &quot;Tue, 25 Aug 2020 23:51:51 +0000&quot;;</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>

View File

@ -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">&#9776;</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'>&#x2212;</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: &amp;<a class="struct" href="../../../../abstutil/collections/struct.Tags.html" title="struct abstutil::collections::Tags">Tags</a>) -&gt; <a class="struct" href="https://doc.rust-lang.org/nightly/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;<a class="struct" href="../../../../map_model/make/initial/lane_specs/struct.LaneSpec.html" title="struct map_model::make::initial::lane_specs::LaneSpec">LaneSpec</a>&gt;</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">&#9776;</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'>&#x2212;</span>]</a></span><a class='srclink' href='../../../../src/map_model/make/initial/lane_specs.rs.html#39-271' 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: &amp;<a class="struct" href="../../../../abstutil/collections/struct.Tags.html" title="struct abstutil::collections::Tags">Tags</a>) -&gt; <a class="struct" href="https://doc.rust-lang.org/nightly/alloc/vec/struct.Vec.html" title="struct alloc::vec::Vec">Vec</a>&lt;<a class="struct" href="../../../../map_model/make/initial/lane_specs/struct.LaneSpec.html" title="struct map_model::make::initial::lane_specs::LaneSpec">LaneSpec</a>&gt;</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>

View File

@ -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">&#9776;</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'>&#x2212;</span>]</a></span><a class='srclink' href='../../../../src/map_model/make/initial/lane_specs.rs.html#1-352' 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">&#9776;</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'>&#x2212;</span>]</a></span><a class='srclink' href='../../../../src/map_model/make/initial/lane_specs.rs.html#1-395' 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.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>

View File

@ -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">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;rustdoc 1.45.2 (d3fb005a3 2020-07-31)&quot;</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">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;Tue, 25 Aug 2020 22:41:49 +0000&quot;</span>;
<span class="kw">pub</span> <span class="kw">const</span> <span class="ident">BUILT_TIME_UTC</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;Tue, 25 Aug 2020 23:51:51 +0000&quot;</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">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;x86_64&quot;</span>;
<span class="doccomment">/// The endianness, given by `cfg!(target_endian)`.</span>

View File

@ -350,6 +350,49 @@
<span id="350">350</span>
<span id="351">351</span>
<span id="352">352</span>
<span id="353">353</span>
<span id="354">354</span>
<span id="355">355</span>
<span id="356">356</span>
<span id="357">357</span>
<span id="358">358</span>
<span id="359">359</span>
<span id="360">360</span>
<span id="361">361</span>
<span id="362">362</span>
<span id="363">363</span>
<span id="364">364</span>
<span id="365">365</span>
<span id="366">366</span>
<span id="367">367</span>
<span id="368">368</span>
<span id="369">369</span>
<span id="370">370</span>
<span id="371">371</span>
<span id="372">372</span>
<span id="373">373</span>
<span id="374">374</span>
<span id="375">375</span>
<span id="376">376</span>
<span id="377">377</span>
<span id="378">378</span>
<span id="379">379</span>
<span id="380">380</span>
<span id="381">381</span>
<span id="382">382</span>
<span id="383">383</span>
<span id="384">384</span>
<span id="385">385</span>
<span id="386">386</span>
<span id="387">387</span>
<span id="388">388</span>
<span id="389">389</span>
<span id="390">390</span>
<span id="391">391</span>
<span id="392">392</span>
<span id="393">393</span>
<span id="394">394</span>
<span id="395">395</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">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>,
@ -536,12 +579,15 @@
<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">&quot;cycleway:right&quot;</span>, <span class="macro">vec</span><span class="macro">!</span>[<span class="string">&quot;lane&quot;</span>, <span class="string">&quot;track&quot;</span>]) {
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="string">&quot;cycleway:right:oneway&quot;</span>, <span class="string">&quot;no&quot;</span>) <span class="op">|</span><span class="op">|</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="string">&quot;oneway:bicycle&quot;</span>, <span class="string">&quot;no&quot;</span>) {
<span class="ident">fwd_side</span>.<span class="ident">push</span>(<span class="ident">back</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">&quot;cycleway:left&quot;</span>, <span class="string">&quot;opposite_lane&quot;</span>) <span class="op">|</span><span class="op">|</span> <span class="ident">tags</span>.<span class="ident">is</span>(<span class="string">&quot;cycleway&quot;</span>, <span class="string">&quot;opposite_lane&quot;</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">&quot;cycleway:left&quot;</span>, <span class="macro">vec</span><span class="macro">!</span>[<span class="string">&quot;lane&quot;</span>, <span class="string">&quot;track&quot;</span>]) {
<span class="kw">if</span> <span class="ident">tags</span>.<span class="ident">is_any</span>(<span class="string">&quot;cycleway:left&quot;</span>, <span class="macro">vec</span><span class="macro">!</span>[<span class="string">&quot;lane&quot;</span>, <span class="string">&quot;opposite_track&quot;</span>, <span class="string">&quot;track&quot;</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">fwd</span>(<span class="ident">LaneType</span>::<span class="ident">Biking</span>));
} <span class="kw">else</span> {
@ -650,9 +696,9 @@
<span class="attribute">#[<span class="ident">test</span>]</span>
<span class="kw">fn</span> <span class="ident">test_osm_to_specs</span>() {
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">ok</span> <span class="op">=</span> <span class="bool-val">true</span>;
<span class="kw">for</span> (<span class="ident">input</span>, <span class="ident">expected_lt</span>, <span class="ident">expected_dir</span>) <span class="kw">in</span> <span class="macro">vec</span><span class="macro">!</span>[
<span class="kw">for</span> (<span class="ident">url</span>, <span class="ident">input</span>, <span class="ident">expected_lt</span>, <span class="ident">expected_dir</span>) <span class="kw">in</span> <span class="macro">vec</span><span class="macro">!</span>[
(
<span class="comment">// https://www.openstreetmap.org/way/428294122</span>
<span class="string">&quot;https://www.openstreetmap.org/way/428294122&quot;</span>,
<span class="macro">vec</span><span class="macro">!</span>[
<span class="string">&quot;lanes=2&quot;</span>,
<span class="string">&quot;oneway=yes&quot;</span>,
@ -663,7 +709,7 @@
<span class="string">&quot;v^^^^&quot;</span>,
),
(
<span class="comment">// https://www.openstreetmap.org/way/8591383</span>
<span class="string">&quot;https://www.openstreetmap.org/way/8591383&quot;</span>,
<span class="macro">vec</span><span class="macro">!</span>[
<span class="string">&quot;lanes=1&quot;</span>,
<span class="string">&quot;oneway=yes&quot;</span>,
@ -674,6 +720,45 @@
<span class="string">&quot;sbbds&quot;</span>,
<span class="string">&quot;vv^^^&quot;</span>,
),
(
<span class="string">&quot;https://www.openstreetmap.org/way/353690151&quot;</span>,
<span class="macro">vec</span><span class="macro">!</span>[
<span class="string">&quot;lanes=4&quot;</span>,
<span class="string">&quot;sidewalk=both&quot;</span>,
<span class="string">&quot;parking:lane:both=parallel&quot;</span>,
<span class="string">&quot;cycleway:right=track&quot;</span>,
<span class="string">&quot;cycleway:right:oneway=no&quot;</span>,
],
<span class="string">&quot;spddddbbps&quot;</span>,
<span class="string">&quot;vvvv^^v^^^&quot;</span>,
),
(
<span class="string">&quot;https://www.openstreetmap.org/way/389654080&quot;</span>,
<span class="macro">vec</span><span class="macro">!</span>[
<span class="string">&quot;lanes=2&quot;</span>,
<span class="string">&quot;sidewalk=both&quot;</span>,
<span class="string">&quot;parking:lane:left=parallel&quot;</span>,
<span class="string">&quot;parking:lane:right=no_stopping&quot;</span>,
<span class="string">&quot;centre_turn_lane=yes&quot;</span>,
<span class="string">&quot;cycleway:right=track&quot;</span>,
<span class="string">&quot;cycleway:right:oneway=no&quot;</span>,
],
<span class="string">&quot;spdCdbbs&quot;</span>,
<span class="string">&quot;vvv^^v^^&quot;</span>,
),
(
<span class="string">&quot;https://www.openstreetmap.org/way/369623526&quot;</span>,
<span class="macro">vec</span><span class="macro">!</span>[
<span class="string">&quot;lanes=1&quot;</span>,
<span class="string">&quot;oneway=yes&quot;</span>,
<span class="string">&quot;sidewalk=both&quot;</span>,
<span class="string">&quot;parking:lane:right=diagonal&quot;</span>,
<span class="string">&quot;cycleway:left=opposite_track&quot;</span>,
<span class="string">&quot;oneway:bicycle=no&quot;</span>,
],
<span class="string">&quot;sbbdps&quot;</span>,
<span class="string">&quot;vv^^^^&quot;</span>,
),
] {
<span class="kw">let</span> <span class="ident">actual</span> <span class="op">=</span> <span class="ident">get_lane_specs_ltr</span>(<span class="kw-2">&amp;</span><span class="ident">tags</span>(<span class="ident">input</span>.<span class="ident">clone</span>()));
<span class="kw">let</span> <span class="ident">actual_lt</span> <span class="op">=</span> <span class="ident">actual</span>
@ -688,7 +773,7 @@
.<span class="ident">join</span>(<span class="string">&quot;&quot;</span>);
<span class="kw">if</span> <span class="ident">actual_lt</span> <span class="op">!</span><span class="op">=</span> <span class="ident">expected_lt</span> <span class="op">|</span><span class="op">|</span> <span class="ident">actual_dir</span> <span class="op">!</span><span class="op">=</span> <span class="ident">expected_dir</span> {
<span class="ident">ok</span> <span class="op">=</span> <span class="bool-val">false</span>;
<span class="macro">println</span><span class="macro">!</span>(<span class="string">&quot;For input:&quot;</span>);
<span class="macro">println</span><span class="macro">!</span>(<span class="string">&quot;For input (example from {}):&quot;</span>, <span class="ident">url</span>);
<span class="kw">for</span> <span class="ident">kv</span> <span class="kw">in</span> <span class="ident">input</span> {
<span class="macro">println</span><span class="macro">!</span>(<span class="string">&quot; {}&quot;</span>, <span class="ident">kv</span>);
}
@ -698,6 +783,7 @@
<span class="macro">println</span><span class="macro">!</span>(<span class="string">&quot;Expected:&quot;</span>);
<span class="macro">println</span><span class="macro">!</span>(<span class="string">&quot; {}&quot;</span>, <span class="ident">expected_lt</span>);
<span class="macro">println</span><span class="macro">!</span>(<span class="string">&quot; {}&quot;</span>, <span class="ident">expected_dir</span>);
<span class="macro">println</span><span class="macro">!</span>(<span class="string">&quot;&quot;</span>);
}
}
<span class="macro">assert</span><span class="macro">!</span>(<span class="ident">ok</span>);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -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/532142eb-d6a9-4a9d-bc2c-3acb1f7260ee.svg" alt="../mdbook-plantuml-img/532142eb-d6a9-4a9d-bc2c-3acb1f7260ee.svg" /></p>
<p><img src="../mdbook-plantuml-img/3d307c2e-7e70-4136-b049-98681b939bd4.svg" alt="../mdbook-plantuml-img/3d307c2e-7e70-4136-b049-98681b939bd4.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/f0e6141b-c488-4d4a-9a68-0b5706ab7f23.svg" alt="../mdbook-plantuml-img/f0e6141b-c488-4d4a-9a68-0b5706ab7f23.svg" /></p>
<p><img src="../mdbook-plantuml-img/e72caed5-65bd-4394-9413-1684112920fe.svg" alt="../mdbook-plantuml-img/e72caed5-65bd-4394-9413-1684112920fe.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/e83934cb-b52f-4273-89ed-1e1213eb6111.svg" alt="../mdbook-plantuml-img/e83934cb-b52f-4273-89ed-1e1213eb6111.svg" /></p>
<p><img src="../mdbook-plantuml-img/c5f89c46-6a55-40b4-844c-6baa5ae5b1d0.svg" alt="../mdbook-plantuml-img/c5f89c46-6a55-40b4-844c-6baa5ae5b1d0.svg" /></p>
</main>