From 2da0ceb741c1193a5ecede15dd32117931bfbd92 Mon Sep 17 00:00:00 2001 From: dabreegster Date: Fri, 11 Dec 2020 06:13:25 +0000 Subject: [PATCH] deploy: 5c09e242250f49f623c2a86a49127208073de7b0 --- .../built_info/constant.BUILT_TIME_UTC.html | 2 +- rustdoc/popdat/enum.Activity.html | 8 +- rustdoc/popdat/fn.generate_scenario.html | 2 +- rustdoc/popdat/index.html | 2 +- .../fn.find_building_for_activity.html | 2 +- rustdoc/popdat/make_person/fn.pick_mode.html | 2 +- rustdoc/popdat/make_person/index.html | 2 +- rustdoc/popdat/struct.Config.html | 4 +- rustdoc/search-index.js | 2 +- .../game-f38555f90777146b/out/built.rs.html | 2 +- rustdoc/src/popdat/lib.rs.html | 4 + rustdoc/src/popdat/make_person.rs.html | 112 +++++++++++++++++- 12 files changed, 130 insertions(+), 14 deletions(-) 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 7cc0a2ceda..c0c66bf474 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, 11 Dec 2020 01:00:09 +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, 11 Dec 2020 06:11:03 +0000";

The built-time in RFC2822, UTC

\ No newline at end of file diff --git a/rustdoc/popdat/enum.Activity.html b/rustdoc/popdat/enum.Activity.html index 115aa589ff..87c46bffb2 100644 --- a/rustdoc/popdat/enum.Activity.html +++ b/rustdoc/popdat/enum.Activity.html @@ -1,20 +1,22 @@ popdat::Activity - Rust -

[][src]Enum popdat::Activity

pub enum Activity {
+

[][src]Enum popdat::Activity

pub enum Activity {
     Breakfast,
     Lunch,
     Dinner,
     School,
     Entertainment,
     Errands,
+    Financial,
+    Healthcare,
     Home,
     Work,
 }

Different things people might do in the day. Maybe it's more clear to call this a DestinationType or similar.

Variants

-
Breakfast
Lunch
Dinner
School
Entertainment
Errands
Home
Work

Trait Implementations

impl Clone for Activity[src]

 //! popdat ("population data") generates `Scenarios` given a map and some external census data.
 //! Some of this functionality should maybe be reorganized or incorporated into the importer crate,
@@ -195,6 +197,8 @@
     School,
     Entertainment,
     Errands,
+    Financial,
+    Healthcare,
     Home,
     Work,
 }
diff --git a/rustdoc/src/popdat/make_person.rs.html b/rustdoc/src/popdat/make_person.rs.html
index ee6fb8463a..7932d983ca 100644
--- a/rustdoc/src/popdat/make_person.rs.html
+++ b/rustdoc/src/popdat/make_person.rs.html
@@ -174,6 +174,61 @@
 171
 172
 173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
 
 use std::collections::HashSet;
 
@@ -249,7 +304,62 @@
 ) -> Option<BuildingID> {
     // What types of OpenStreetMap amenities will satisfy each activity?
     let categories: HashSet<&'static str> = match activity {
-        Activity::Entertainment => vec!["cinema", "theatre"],
+        Activity::Breakfast => vec!["cafe"],
+        Activity::Lunch => vec!["pub", "food_court", "fast_food"],
+        Activity::Dinner => vec!["restaurant", "theatre", "biergarten"],
+        Activity::School => vec![
+            "college",
+            "kindergarten",
+            "language_school",
+            "library",
+            "music_school",
+            "university",
+        ],
+        Activity::Entertainment => vec![
+            "arts_centre",
+            "casino",
+            "cinema",
+            "community_centre",
+            "fountain",
+            "gambling",
+            "nightclub",
+            "planetarium",
+            "public_bookcase",
+            "pool",
+            "dojo",
+            "social_centre",
+            "social_centre",
+            "studio",
+            "theatre",
+            "bar",
+            "bbq",
+            "bicycle_rental",
+            "boat_rental",
+            "boat_sharing",
+            "dive_centre",
+            "internet_cafe",
+        ],
+        Activity::Errands => vec![
+            "marketplace",
+            "post_box",
+            "photo_booth",
+            "recycling",
+            "townhall",
+        ],
+        Activity::Financial => vec!["bank", "atm", "bureau_de_change"],
+        Activity::Healthcare => vec![
+            "baby_hatch",
+            "clinic",
+            "dentist",
+            "doctors",
+            "hospital",
+            "nursing_home",
+            "pharmacy",
+            "social_facility",
+            "veterinary",
+            "childcare",
+        ],
+        Activity::Work => vec!["bank", "clinic"],
         // TODO Fill this out. amenity_type in map_gui/src/tools/mod.rs might be helpful. It might
         // also be helpful to edit the list of possible activities in lib.rs too.
         _ => vec![],