Move download to own crate

.idea/mapr.iml

@@ -4,7 +4,9 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/examples" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/libs/mapr_utils/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
+      <excludeFolder url="file://$MODULE_DIR$/libs/mapr_utils/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/runConfigurations/Run_downloader.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run downloader" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="command" value="run --bin download_tiles" />
-    <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <option name="workingDirectory" value="file://$PROJECT_DIR$/libs/mapr_utils" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
     <option name="allFeatures" value="false" />

Cargo.toml

@@ -19,7 +19,6 @@ wasm-bindgen-futures = "0.4"
 console_log = { version = "0.2", features = ["color"] }
 
 [dependencies]
-
 # Futures
 futures = "0.3.5"
 pollster = "0.2"
@@ -46,9 +45,6 @@ env_logger = "0.9"
 hexdump = "0.1"
 bytemuck = "1.2.0"
 
-# Network
-# reqwest = { version = "0.11", features = ["gzip"] } FIXME: Incompatible with wasm
-
 # Serialization
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -62,7 +58,3 @@ env_logger = "0.8" # Used for test-env-log
 [[bin]]
 name = "mapr"
 path = "src/main.rs"
-
-[[bin]]
-name = "download_tiles"
-path = "src/utils/tile_downloader.rs"

libs/mapr_utils/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "mapr-utils"
+version = "0.1.0"
+description = ""
+edition = "2021"
+
+[dependencies]
+log = "0.4"
+# Network
+reqwest = { version = "0.11", features = ["gzip"] }
+vector-tile = { path = "../vector_tile" }
+tokio = { version = "1.14", features = ["full"] }
+
+[[bin]]
+name = "download_tiles"
+path = "src/tile_downloader.rs"

libs/mapr_utils/src/tile_downloader.rs

@@ -1,6 +1,7 @@
 use std::fs::File;
 use std::io::copy;
 use std::path::Path;
+use reqwest::Client;
 
 use vector_tile::grid::*;
 
@@ -13,7 +14,7 @@ pub async fn download_tiles() {
             y = y,
         );
         println!("{}", target);
-        let client = reqwest::Client::builder()
+        let client = Client::builder()
             .gzip(true)
             .build().unwrap();
 
@@ -29,6 +30,7 @@ pub async fn download_tiles() {
     }
 }
 
-fn main() {
+#[tokio::main]
-    pollster::block_on(download_tiles());
+async fn main() {
+    download_tiles().await
 }

src/piplines.rs

@@ -1,5 +1,5 @@
 use wgpu::{FragmentState, PipelineLayout, RenderPipelineDescriptor, VertexState};
-use crate::texture::Texture;
+
 
 pub fn create_map_render_pipeline_description<'a>(
     pipeline_layout: &'a PipelineLayout,

src/state.rs

@@ -4,11 +4,11 @@ use std::ops::Range;
 
 use lyon::math::Vector;
 use lyon::tessellation::VertexBuffers;
-use vector_tile::{parse_tile, parse_tile_reader};
+use vector_tile::{parse_tile_reader};
 use wgpu::util::DeviceExt;
-use winit::dpi::PhysicalSize;
+
-use winit::event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent};
+use winit::event::{ElementState, KeyboardInput, VirtualKeyCode, WindowEvent};
-use winit::event_loop::ControlFlow;
+
 use winit::window::Window;
 
 use crate::fps_meter::FPSMeter;

src/texture.rs

@@ -9,7 +9,7 @@ impl Texture {
     pub fn create_depth_texture(
         device: &wgpu::Device,
         config: &wgpu::SurfaceConfiguration,
-        label: &str,
+        _label: &str,
         sample_count: u32,
     ) -> Self {