From a383dd033689d2f18b7dc26a385b9883388c5336 Mon Sep 17 00:00:00 2001 From: dabreegster Date: Mon, 21 Nov 2022 11:37:45 +0000 Subject: [PATCH] deploy: ede907e23971427413b25982ef2c22e7c1309c6a --- rustdoc/map_gui/tools/fn.app_header.html | 2 +- rustdoc/map_gui/tools/fn.change_map_btn.html | 2 +- rustdoc/map_gui/tools/fn.find_exe.html | 2 +- rustdoc/map_gui/tools/fn.home_btn.html | 2 +- .../map_gui/tools/fn.intersections_from_roads.html | 2 +- rustdoc/map_gui/tools/fn.nice_country_name.html | 2 +- rustdoc/map_gui/tools/fn.nice_map_name.html | 2 +- rustdoc/map_gui/tools/fn.update_url_map_name.html | 2 +- rustdoc/map_gui/tools/index.html | 2 +- .../built_info/constant.BUILT_TIME_UTC.html | 2 +- .../build/map_gui-63c5bcb4b09cf8fd/out/built.rs.html | 2 +- rustdoc/src/map_gui/tools/mod.rs.html | 12 +++++++++++- 12 files changed, 22 insertions(+), 12 deletions(-) diff --git a/rustdoc/map_gui/tools/fn.app_header.html b/rustdoc/map_gui/tools/fn.app_header.html index abab23a4c1..d3f66f5464 100644 --- a/rustdoc/map_gui/tools/fn.app_header.html +++ b/rustdoc/map_gui/tools/fn.app_header.html @@ -1,3 +1,3 @@ -app_header in map_gui::tools - Rust

Function map_gui::tools::app_header

source · [−]
pub fn app_header(ctx: &EventCtx<'_>, app: &dyn AppLike, title: &str) -> Widget
Expand description

A standard way to group a home button back to the title screen, the title of the current app, +app_header in map_gui::tools - Rust

Function map_gui::tools::app_header

source · [−]
pub fn app_header(ctx: &EventCtx<'_>, app: &dyn AppLike, title: &str) -> Widget
Expand description

A standard way to group a home button back to the title screen, the title of the current app, and a button to change maps. Callers must handle the change map and home click events.

\ No newline at end of file diff --git a/rustdoc/map_gui/tools/fn.change_map_btn.html b/rustdoc/map_gui/tools/fn.change_map_btn.html index bae819d432..ce0824d1e5 100644 --- a/rustdoc/map_gui/tools/fn.change_map_btn.html +++ b/rustdoc/map_gui/tools/fn.change_map_btn.html @@ -1,2 +1,2 @@ -change_map_btn in map_gui::tools - Rust

Function map_gui::tools::change_map_btn

source · [−]
pub fn change_map_btn(ctx: &EventCtx<'_>, app: &dyn AppLike) -> Widget
Expand description

A button to change maps, with default keybindings

+change_map_btn in map_gui::tools - Rust

Function map_gui::tools::change_map_btn

source · [−]
pub fn change_map_btn(ctx: &EventCtx<'_>, app: &dyn AppLike) -> Widget
Expand description

A button to change maps, with default keybindings

\ No newline at end of file diff --git a/rustdoc/map_gui/tools/fn.find_exe.html b/rustdoc/map_gui/tools/fn.find_exe.html index 99c1453a37..64260322b9 100644 --- a/rustdoc/map_gui/tools/fn.find_exe.html +++ b/rustdoc/map_gui/tools/fn.find_exe.html @@ -1,2 +1,2 @@ -find_exe in map_gui::tools - Rust

Function map_gui::tools::find_exe

source · [−]
pub fn find_exe(cmd: &str) -> String
Expand description

Returns the path to an executable. Native-only.

+find_exe in map_gui::tools - Rust

Function map_gui::tools::find_exe

source · [−]
pub fn find_exe(cmd: &str) -> String
Expand description

Returns the path to an executable. Native-only.

\ No newline at end of file diff --git a/rustdoc/map_gui/tools/fn.home_btn.html b/rustdoc/map_gui/tools/fn.home_btn.html index c932de0573..d27875fbab 100644 --- a/rustdoc/map_gui/tools/fn.home_btn.html +++ b/rustdoc/map_gui/tools/fn.home_btn.html @@ -1,2 +1,2 @@ -home_btn in map_gui::tools - Rust

Function map_gui::tools::home_btn

source · [−]
pub fn home_btn(ctx: &EventCtx<'_>) -> Widget
Expand description

A button to return to the title screen

+home_btn in map_gui::tools - Rust

Function map_gui::tools::home_btn

source · [−]
pub fn home_btn(ctx: &EventCtx<'_>) -> Widget
Expand description

A button to return to the title screen

\ No newline at end of file diff --git a/rustdoc/map_gui/tools/fn.intersections_from_roads.html b/rustdoc/map_gui/tools/fn.intersections_from_roads.html index ce179d778f..650b470134 100644 --- a/rustdoc/map_gui/tools/fn.intersections_from_roads.html +++ b/rustdoc/map_gui/tools/fn.intersections_from_roads.html @@ -1 +1 @@ -intersections_from_roads in map_gui::tools - Rust

Function map_gui::tools::intersections_from_roads

source · [−]
pub fn intersections_from_roads(
    roads: &BTreeSet<RoadID>,
    map: &Map
) -> BTreeSet<IntersectionID>
\ No newline at end of file +intersections_from_roads in map_gui::tools - Rust

Function map_gui::tools::intersections_from_roads

source · [−]
pub fn intersections_from_roads(
    roads: &BTreeSet<RoadID>,
    map: &Map
) -> BTreeSet<IntersectionID>
\ No newline at end of file diff --git a/rustdoc/map_gui/tools/fn.nice_country_name.html b/rustdoc/map_gui/tools/fn.nice_country_name.html index d463ea4463..cd60085c2d 100644 --- a/rustdoc/map_gui/tools/fn.nice_country_name.html +++ b/rustdoc/map_gui/tools/fn.nice_country_name.html @@ -1 +1 @@ -nice_country_name in map_gui::tools - Rust

Function map_gui::tools::nice_country_name

source · [−]
pub fn nice_country_name(code: &str) -> &str
\ No newline at end of file +nice_country_name in map_gui::tools - Rust

Function map_gui::tools::nice_country_name

source · [−]
pub fn nice_country_name(code: &str) -> &str
\ No newline at end of file diff --git a/rustdoc/map_gui/tools/fn.nice_map_name.html b/rustdoc/map_gui/tools/fn.nice_map_name.html index 004c862d03..f01691e506 100644 --- a/rustdoc/map_gui/tools/fn.nice_map_name.html +++ b/rustdoc/map_gui/tools/fn.nice_map_name.html @@ -1 +1 @@ -nice_map_name in map_gui::tools - Rust

Function map_gui::tools::nice_map_name

source · [−]
pub fn nice_map_name(name: &MapName) -> &str
\ No newline at end of file +nice_map_name in map_gui::tools - Rust

Function map_gui::tools::nice_map_name

source · [−]
pub fn nice_map_name(name: &MapName) -> &str
\ No newline at end of file diff --git a/rustdoc/map_gui/tools/fn.update_url_map_name.html b/rustdoc/map_gui/tools/fn.update_url_map_name.html index af1758d9e1..ac4b990fe1 100644 --- a/rustdoc/map_gui/tools/fn.update_url_map_name.html +++ b/rustdoc/map_gui/tools/fn.update_url_map_name.html @@ -1,2 +1,2 @@ -update_url_map_name in map_gui::tools - Rust

Function map_gui::tools::update_url_map_name

source · [−]
pub fn update_url_map_name(app: &dyn AppLike)
Expand description

Modify the current URL to set the first free parameter to the current map name.

+update_url_map_name in map_gui::tools - Rust

Function map_gui::tools::update_url_map_name

source · [−]
pub fn update_url_map_name(app: &dyn AppLike)
Expand description

Modify the current URL to set the first free parameter to the current map name.

\ No newline at end of file diff --git a/rustdoc/map_gui/tools/index.html b/rustdoc/map_gui/tools/index.html index 00f278c41c..dbbb197d6d 100644 --- a/rustdoc/map_gui/tools/index.html +++ b/rustdoc/map_gui/tools/index.html @@ -1,4 +1,4 @@ -map_gui::tools - Rust

Module map_gui::tools

source · [−]
Expand description

Assorted tools and UI states that’re useful for applications built to display maps.

+map_gui::tools - Rust

Module map_gui::tools

source · [−]
Expand description

Assorted tools and UI states that’re useful for applications built to display maps.

Modules

camera 🔒
city_picker 🔒
colors 🔒
command 🔒
compare_counts
draw_overlapping_paths 🔒
heatmap 🔒
icons 🔒
importer 🔒
labels 🔒
minimap 🔒
navigate 🔒
polygon 🔒
title_screen 🔒
trip_files 🔒
turn_explorer 🔒
ui 🔒
Generic UI tools. Some of this should perhaps be lifted to widgetry.
updater 🔒
waypoints 🔒

Structs

CameraState
Represents the state of a widgetry Canvas.
CityPicker
Lets the player switch maps.
ColorDiscrete
ColorNetwork
DefaultMap
Track the last map used, to resume next session.
DrawRoadLabels
Labels roads when unzoomed. Label size and frequency depends on the zoom level.
DrawSimpleRoadLabels
Draws labels in map-space that roughly fit on the roads. Don’t change behavior during zooming; labels are only meant to be legible when zoomed in.
EditPolygon
FilePicker
Grid
A 2D grid containing some arbitrary data.
HeatmapOptions
InputWaypoints
Click to add waypoints, drag them, see the list on a panel and delete them. The caller owns the Panel and the World, since there’s probably more stuff there too.
Minimap
Navigator
RunCommand
Executes a command and displays STDOUT and STDERR in a loading screen window. Only works on diff --git a/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html b/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html index 91880d97b5..203d8cc598 100644 --- a/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html +++ b/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html @@ -1,2 +1,2 @@ -BUILT_TIME_UTC in map_gui::tools::title_screen::built_info - Rust

Constant map_gui::tools::title_screen::built_info::BUILT_TIME_UTC

source · [−]
pub const BUILT_TIME_UTC: &'static str = r"Thu, 17 Nov 2022 15:46:45 +0000";
Expand description

The build time in RFC2822, UTC.

+BUILT_TIME_UTC in map_gui::tools::title_screen::built_info - Rust

Constant map_gui::tools::title_screen::built_info::BUILT_TIME_UTC

source · [−]
pub const BUILT_TIME_UTC: &'static str = r"Mon, 21 Nov 2022 11:36:11 +0000";
Expand description

The build time in RFC2822, UTC.

\ No newline at end of file diff --git a/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-63c5bcb4b09cf8fd/out/built.rs.html b/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-63c5bcb4b09cf8fd/out/built.rs.html index 0a56223eba..b35180e199 100644 --- a/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-63c5bcb4b09cf8fd/out/built.rs.html +++ b/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-63c5bcb4b09cf8fd/out/built.rs.html @@ -174,7 +174,7 @@ pub const RUSTDOC_VERSION: &str = r"rustdoc 1.65.0 (897e37553 2022-11-02)"; #[doc=r#"The build time in RFC2822, UTC."#] #[allow(dead_code)] -pub const BUILT_TIME_UTC: &str = r"Thu, 17 Nov 2022 15:46:45 +0000"; +pub const BUILT_TIME_UTC: &str = r"Mon, 21 Nov 2022 11:36:11 +0000"; #[doc=r#"The target architecture, given by `CARGO_CFG_TARGET_ARCH`."#] #[allow(dead_code)] pub const CFG_TARGET_ARCH: &str = r"x86_64"; diff --git a/rustdoc/src/map_gui/tools/mod.rs.html b/rustdoc/src/map_gui/tools/mod.rs.html index e589e28f5f..638817eb57 100644 --- a/rustdoc/src/map_gui/tools/mod.rs.html +++ b/rustdoc/src/map_gui/tools/mod.rs.html @@ -442,6 +442,11 @@ 442 443 444 +445 +446 +447 +448 +449 
//! Assorted tools and UI states that're useful for applications built to display maps.
 
 use std::collections::BTreeSet;
@@ -569,6 +574,10 @@
             ("zurich", "west") => "Zürich (west)",
             _ => &name.map,
         },
+        "cl" => match (name.city.city.as_ref(), name.map.as_ref()) {
+            ("santiago", "bellavista") => "Bellavista (Santiago)",
+            _ => &name.map,
+        },
         "cz" => match (name.city.city.as_ref(), name.map.as_ref()) {
             ("frytek_mistek", "huge") => "Frýdek-Místek (entire area)",
             _ => &name.map,
@@ -764,13 +773,14 @@
 
 pub fn nice_country_name(code: &str) -> &str {
     // If you add something here, please also add the flag to data/system/assets/flags.
-    // https://github.com/hampusborgos/country-flags/tree/master/svg
+    // https://github.com/hampusborgos/country-flags/tree/main/svg
     match code {
         "au" => "Australia",
         "at" => "Austria",
         "br" => "Brazil",
         "ca" => "Canada",
         "ch" => "Switzerland",
+        "cl" => "Chile",
         "cz" => "Czech Republic",
         "de" => "Germany",
         "fr" => "France",