From 71959802a6b499da2808d11bfb47b9acc0ef29c9 Mon Sep 17 00:00:00 2001 From: dabreegster Date: Fri, 8 Jan 2021 18:04:08 +0000 Subject: [PATCH] deploy: 6e3ce1d9eea8e42adb478fdb6ac9a87275a237aa --- .../convert_osm/extract/fn.extract_osm.html | 2 +- .../convert_osm/extract/fn.get_area_type.html | 2 +- .../extract/fn.get_bldg_amenities.html | 2 +- rustdoc/convert_osm/extract/fn.is_bldg.html | 2 +- rustdoc/convert_osm/extract/fn.is_road.html | 2 +- rustdoc/convert_osm/extract/index.html | 2 +- .../convert_osm/extract/struct.OsmExtract.html | 2 +- rustdoc/convert_osm/snappy/fn.dump_output.html | 2 +- .../convert_osm/snappy/fn.snap_cycleways.html | 2 +- rustdoc/convert_osm/snappy/fn.v1.html | 2 +- rustdoc/convert_osm/snappy/index.html | 2 +- .../built_info/constant.BUILT_TIME_UTC.html | 2 +- rustdoc/src/convert_osm/extract.rs.html | 10 ++++++---- rustdoc/src/convert_osm/snappy.rs.html | 18 ------------------ .../game-b5501e76eef510ad/out/built.rs.html | 2 +- 15 files changed, 19 insertions(+), 35 deletions(-) diff --git a/rustdoc/convert_osm/extract/fn.extract_osm.html b/rustdoc/convert_osm/extract/fn.extract_osm.html index ac8c208e8c..8900390f2d 100644 --- a/rustdoc/convert_osm/extract/fn.extract_osm.html +++ b/rustdoc/convert_osm/extract/fn.extract_osm.html @@ -1,4 +1,4 @@ convert_osm::extract::extract_osm - Rust

[−][src]Function convert_osm::extract::extract_osm

pub fn extract_osm(
    map: &mut RawMap, 
    opts: &Options, 
    timer: &mut Timer<'_>
) -> OsmExtract
\ No newline at end of file + Change settings

[−][src]Function convert_osm::extract::extract_osm

pub fn extract_osm(
    map: &mut RawMap, 
    opts: &Options, 
    timer: &mut Timer<'_>
) -> OsmExtract
\ No newline at end of file diff --git a/rustdoc/convert_osm/extract/fn.get_area_type.html b/rustdoc/convert_osm/extract/fn.get_area_type.html index 2d214b53cb..f2df1d38b3 100644 --- a/rustdoc/convert_osm/extract/fn.get_area_type.html +++ b/rustdoc/convert_osm/extract/fn.get_area_type.html @@ -1,4 +1,4 @@ convert_osm::extract::get_area_type - Rust

[−][src]Function convert_osm::extract::get_area_type

fn get_area_type(tags: &Tags) -> Option<AreaType>
\ No newline at end of file + Change settings

[−][src]Function convert_osm::extract::get_area_type

fn get_area_type(tags: &Tags) -> Option<AreaType>
\ No newline at end of file diff --git a/rustdoc/convert_osm/extract/fn.get_bldg_amenities.html b/rustdoc/convert_osm/extract/fn.get_bldg_amenities.html index d7f8451d52..6f8d882809 100644 --- a/rustdoc/convert_osm/extract/fn.get_bldg_amenities.html +++ b/rustdoc/convert_osm/extract/fn.get_bldg_amenities.html @@ -1,4 +1,4 @@ convert_osm::extract::get_bldg_amenities - Rust

[−][src]Function convert_osm::extract::get_bldg_amenities

fn get_bldg_amenities(tags: &Tags) -> Vec<Amenity>
\ No newline at end of file + Change settings

[−][src]Function convert_osm::extract::get_bldg_amenities

fn get_bldg_amenities(tags: &Tags) -> Vec<Amenity>
\ No newline at end of file diff --git a/rustdoc/convert_osm/extract/fn.is_bldg.html b/rustdoc/convert_osm/extract/fn.is_bldg.html index 42ff56838c..e4b5655bf7 100644 --- a/rustdoc/convert_osm/extract/fn.is_bldg.html +++ b/rustdoc/convert_osm/extract/fn.is_bldg.html @@ -1,4 +1,4 @@ convert_osm::extract::is_bldg - Rust

[−][src]Function convert_osm::extract::is_bldg

fn is_bldg(tags: &Tags) -> bool
\ No newline at end of file + Change settings

[−][src]Function convert_osm::extract::is_bldg

fn is_bldg(tags: &Tags) -> bool
\ No newline at end of file diff --git a/rustdoc/convert_osm/extract/fn.is_road.html b/rustdoc/convert_osm/extract/fn.is_road.html index f98ea6ddfc..b163871377 100644 --- a/rustdoc/convert_osm/extract/fn.is_road.html +++ b/rustdoc/convert_osm/extract/fn.is_road.html @@ -1,4 +1,4 @@ convert_osm::extract::is_road - Rust

[−][src]Function convert_osm::extract::is_road

fn is_road(tags: &mut Tags, opts: &Options) -> bool
\ No newline at end of file + Change settings

[−][src]Function convert_osm::extract::is_road

fn is_road(tags: &mut Tags, opts: &Options) -> bool
\ No newline at end of file diff --git a/rustdoc/convert_osm/extract/index.html b/rustdoc/convert_osm/extract/index.html index ecb85648f9..54c01c8ce9 100644 --- a/rustdoc/convert_osm/extract/index.html +++ b/rustdoc/convert_osm/extract/index.html @@ -1,6 +1,6 @@ convert_osm::extract - Rust

[−][src]Module convert_osm::extract

Structs

+ Change settings

[−][src]Module convert_osm::extract

Structs

OsmExtract

Functions

extract_osm
get_area_type
get_bldg_amenities
is_bldg
is_road
\ No newline at end of file diff --git a/rustdoc/convert_osm/extract/struct.OsmExtract.html b/rustdoc/convert_osm/extract/struct.OsmExtract.html index c8ccfbd0d3..fb058e6294 100644 --- a/rustdoc/convert_osm/extract/struct.OsmExtract.html +++ b/rustdoc/convert_osm/extract/struct.OsmExtract.html @@ -1,7 +1,7 @@ convert_osm::extract::OsmExtract - Rust

[−][src]Struct convert_osm::extract::OsmExtract

pub struct OsmExtract {
+                Change settings

[−][src]Struct convert_osm::extract::OsmExtract

pub struct OsmExtract {
     pub roads: Vec<(WayID, RawRoad)>,
     pub traffic_signals: HashMap<HashablePt2D, bool>,
     pub osm_node_ids: HashMap<HashablePt2D, NodeID>,
diff --git a/rustdoc/convert_osm/snappy/fn.dump_output.html b/rustdoc/convert_osm/snappy/fn.dump_output.html
index d3098601b2..b2744e677c 100644
--- a/rustdoc/convert_osm/snappy/fn.dump_output.html
+++ b/rustdoc/convert_osm/snappy/fn.dump_output.html
@@ -1,4 +1,4 @@
 convert_osm::snappy::dump_output - Rust
 
 
[−][src]Function convert_osm::snappy::dump_output
fn dump_output(
    map: &RawMap, 
    cycleways: &BTreeMap<WayID, ExtraShape>, 
    road_edges: &HashMap<(OriginalRoad, Direction), PolyLine>, 
    matches: MultiMap<(OriginalRoad, Direction), WayID>
)

\ No newline at end of file
+                Change settings

[−][src]Function convert_osm::snappy::dump_output

fn dump_output(
    map: &RawMap, 
    cycleways: &BTreeMap<WayID, ExtraShape>, 
    road_edges: &HashMap<(OriginalRoad, Direction), PolyLine>, 
    matches: MultiMap<(OriginalRoad, Direction), WayID>
)
\ No newline at end of file diff --git a/rustdoc/convert_osm/snappy/fn.snap_cycleways.html b/rustdoc/convert_osm/snappy/fn.snap_cycleways.html index 5cee449a0c..2084c34b60 100644 --- a/rustdoc/convert_osm/snappy/fn.snap_cycleways.html +++ b/rustdoc/convert_osm/snappy/fn.snap_cycleways.html @@ -1,5 +1,5 @@ convert_osm::snappy::snap_cycleways - Rust

[−][src]Function convert_osm::snappy::snap_cycleways

pub fn snap_cycleways(map: &RawMap, timer: &mut Timer<'_>)

Attempt to snap separately mapped cycleways to main roads. Emit extra KML files to debug later.

+ Change settings

[−][src]Function convert_osm::snappy::snap_cycleways

pub fn snap_cycleways(map: &RawMap, timer: &mut Timer<'_>)

Attempt to snap separately mapped cycleways to main roads. Emit extra KML files to debug later.

\ No newline at end of file diff --git a/rustdoc/convert_osm/snappy/fn.v1.html b/rustdoc/convert_osm/snappy/fn.v1.html index 52948bd406..6f0de17fd1 100644 --- a/rustdoc/convert_osm/snappy/fn.v1.html +++ b/rustdoc/convert_osm/snappy/fn.v1.html @@ -1,4 +1,4 @@ convert_osm::snappy::v1 - Rust

[−][src]Function convert_osm::snappy::v1

fn v1(
    map: &RawMap, 
    cycleways: &BTreeMap<WayID, ExtraShape>, 
    road_edges: &HashMap<(OriginalRoad, Direction), PolyLine>
) -> MultiMap<(OriginalRoad, Direction), WayID>
\ No newline at end of file + Change settings

[−][src]Function convert_osm::snappy::v1

fn v1(
    map: &RawMap, 
    cycleways: &BTreeMap<WayID, ExtraShape>, 
    road_edges: &HashMap<(OriginalRoad, Direction), PolyLine>
) -> MultiMap<(OriginalRoad, Direction), WayID>
\ No newline at end of file diff --git a/rustdoc/convert_osm/snappy/index.html b/rustdoc/convert_osm/snappy/index.html index f721100740..f192f42bd3 100644 --- a/rustdoc/convert_osm/snappy/index.html +++ b/rustdoc/convert_osm/snappy/index.html @@ -1,6 +1,6 @@ convert_osm::snappy - Rust

[−][src]Module convert_osm::snappy

Functions

+ Change settings

[−][src]Module convert_osm::snappy

Functions

dump_output
snap_cycleways

Attempt to snap separately mapped cycleways to main roads. Emit extra KML files to debug later.

v1
\ No newline at end of file diff --git a/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html b/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html index 59ca4a6849..5e6bb6e895 100644 --- a/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html +++ b/rustdoc/game/pregame/built_info/constant.BUILT_TIME_UTC.html @@ -1,5 +1,5 @@ game::pregame::built_info::BUILT_TIME_UTC - Rust

[−][src]Constant game::pregame::built_info::BUILT_TIME_UTC

pub const BUILT_TIME_UTC: &str = "Fri, 08 Jan 2021 17:46:58 +0000";

The built-time in RFC2822, UTC

+ Change settings

[−][src]Constant game::pregame::built_info::BUILT_TIME_UTC

pub const BUILT_TIME_UTC: &str = "Fri, 08 Jan 2021 18:01:25 +0000";

The built-time in RFC2822, UTC

\ No newline at end of file diff --git a/rustdoc/src/convert_osm/extract.rs.html b/rustdoc/src/convert_osm/extract.rs.html index 1563b8021c..e7246124ce 100644 --- a/rustdoc/src/convert_osm/extract.rs.html +++ b/rustdoc/src/convert_osm/extract.rs.html @@ -556,11 +556,13 @@ 553 554 555 +556 
 use std::collections::{BTreeMap, BTreeSet, HashMap};
 
 use osm::{NodeID, OsmID, RelationID, WayID};
 
+use abstio::MapName;
 use abstutil::{retain_btreemap, Tags, Timer};
 use geom::{HashablePt2D, Polygon, Pt2D, Ring};
 use kml::{ExtraShape, ExtraShapes};
@@ -719,10 +721,10 @@
         }
     }
 
-    if map.name.city != "oneshot"
-        && ((map.name.city == "seattle" && map.name.map == "huge_seattle")
-            || map.name.city != "seattle")
-    {
+    // Since we're not actively working on using footways and service roads, stop generating except
+    // in Seattle. In the future, this should only happen for the largest or canonical map per
+    // city, but there's no way to express that right now.
+    if map.name == MapName::seattle("huge_seattle") {
         abstio::write_binary(
             abstio::path(format!("input/{}/footways.bin", map.name.city)),
             &extra_footways,
diff --git a/rustdoc/src/convert_osm/snappy.rs.html b/rustdoc/src/convert_osm/snappy.rs.html
index 9216df3774..ff4a5585d5 100644
--- a/rustdoc/src/convert_osm/snappy.rs.html
+++ b/rustdoc/src/convert_osm/snappy.rs.html
@@ -169,15 +169,6 @@
 166
 167
 168
-169
-170
-171
-172
-173
-174
-175
-176
-177
 
 use std::collections::{BTreeMap, HashMap, HashSet};
 
@@ -191,15 +182,6 @@
 
 /// Attempt to snap separately mapped cycleways to main roads. Emit extra KML files to debug later.
 pub fn snap_cycleways(map: &RawMap, timer: &mut Timer) {
-    if map.name.city == "oneshot" {
-        return;
-    }
-
-    // TODO Hack! Fix upstream problems.
-    if map.name.city == "xian" {
-        return;
-    }
-
     // TODO The output here is nondeterministic and I haven't figured out why. Instead of spurious
     // data diffs, just totally disable this experiment for now. Will fix when this becomes active
     // work again.
diff --git a/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-b5501e76eef510ad/out/built.rs.html b/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-b5501e76eef510ad/out/built.rs.html
index ed17c51e29..03c46b8d84 100644
--- a/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-b5501e76eef510ad/out/built.rs.html
+++ b/rustdoc/src/game/home/runner/work/abstreet/abstreet/target/debug/build/game-b5501e76eef510ad/out/built.rs.html
@@ -122,7 +122,7 @@
 /// The output of `rustdoc -V`
 pub const RUSTDOC_VERSION: &str = "rustdoc 1.49.0 (e1884a8e3 2020-12-29)";
 /// The built-time in RFC2822, UTC
-pub const BUILT_TIME_UTC: &str = "Fri, 08 Jan 2021 17:46:58 +0000";
+pub const BUILT_TIME_UTC: &str = "Fri, 08 Jan 2021 18:01:25 +0000";
 /// The target architecture, given by `cfg!(target_arch)`.
 pub const CFG_TARGET_ARCH: &str = "x86_64";
 /// The endianness, given by `cfg!(target_endian)`.