Bake less huge data files into the .wasm. #21

This has the effect of breaking the city loader, because it lists bundled files to discover other cities. Going to rethink that next.
a-b-street · Oct 8, 2020 · fa49817 · fa49817
1 parent 64bc4ee
commit fa49817
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/abstutil/Cargo.toml b/abstutil/Cargo.toml
@@ -23,4 +23,4 @@ serde_json = "1.0.57"
 termion = "1.5.1"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-include_dir = "0.6.0"
+include_dir = { git = "https://github.com/dabreegster/include_dir", branch = "union" }
diff --git a/abstutil/src/io_web.rs b/abstutil/src/io_web.rs
@@ -7,7 +7,16 @@ use serde::de::DeserializeOwned;
 use serde::Serialize;
 use std::io::{Error, ErrorKind};
 
-static SYSTEM_DATA: include_dir::Dir = include_dir::include_dir!("../data/system");
+// Bring in everything from data/system/ matching one of the prefixes -- aka, no scenarios, and
+// only the smallest map. Everything else has to be dynamically loaded over HTTP.
+static SYSTEM_DATA: include_dir::Dir = include_dir::include_dir!(
+    "../data/system",
+    "assets/",
+    "cities/",
+    "fonts/",
+    "maps/montlake.bin",
+    "proposals/"
+);
 
 pub fn file_exists<I: Into<String>>(path: I) -> bool {
     SYSTEM_DATA