archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Maximilian Ammann 2022-09-17 15:48:41 +02:00
parent aa07abb683
commit 3e1c24e533
6 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maplibre-demo/src/headed.rs
View File

@ -1,6 +1,5 @@
use maplibre::io::transferables::DefaultTransferables;
use maplibre::{ use maplibre::{
io::apc::SchedulerAsyncProcedureCall, io::{apc::SchedulerAsyncProcedureCall, transferables::DefaultTransferables},
platform::{http_client::ReqwestHttpClient, scheduler::TokioScheduler}, platform::{http_client::ReqwestHttpClient, scheduler::TokioScheduler},
MapBuilder, MapBuilder,
}; };

3
maplibre-winit/src/winit/mod.rs
View File

@ -1,7 +1,6 @@
use std::{cell::RefCell, marker::PhantomData, ops::Deref, rc::Rc}; use std::{cell::RefCell, marker::PhantomData, ops::Deref, rc::Rc};
use instant::Instant; use instant::Instant;
use maplibre::io::transferables::DefaultTransferables;
use maplibre::{ use maplibre::{
environment::Environment, environment::Environment,
error::Error, error::Error,
@ -9,7 +8,7 @@ use maplibre::{
apc::{AsyncProcedureCall, Message}, apc::{AsyncProcedureCall, Message},
scheduler::Scheduler, scheduler::Scheduler,
source_client::HttpClient, source_client::HttpClient,
transferables::Transferables, transferables::{DefaultTransferables, Transferables},
}, },
map_schedule::InteractiveMapSchedule, map_schedule::InteractiveMapSchedule,
window::{EventLoop, HeadedMapWindow, MapWindowConfig}, window::{EventLoop, HeadedMapWindow, MapWindowConfig},

3
maplibre/src/headless.rs
View File

@ -12,7 +12,6 @@ use std::{
use tokio::{runtime::Handle, task}; use tokio::{runtime::Handle, task};
use wgpu::{BufferAsyncError, BufferSlice}; use wgpu::{BufferAsyncError, BufferSlice};
use crate::io::transferables::DefaultTransferables;
use crate::{ use crate::{
context::{MapContext, ViewState}, context::{MapContext, ViewState},
coords::{LatLon, ViewRegion, WorldCoords, WorldTileCoords, Zoom, TILE_SIZE}, coords::{LatLon, ViewRegion, WorldCoords, WorldTileCoords, Zoom, TILE_SIZE},
@ -24,7 +23,7 @@ use crate::{
source_client::HttpSourceClient, source_client::HttpSourceClient,
tile_pipelines::build_vector_tile_pipeline, tile_pipelines::build_vector_tile_pipeline,
tile_repository::{StoredLayer, TileRepository}, tile_repository::{StoredLayer, TileRepository},
transferables::Transferables, transferables::{DefaultTransferables, Transferables},
TileRequest, TileRequest,
}, },
render::{ render::{

3
maplibre/src/io/apc.rs
View File

@ -10,12 +10,11 @@ use std::{
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::io::transferables::DefaultTransferables;
use crate::{ use crate::{
coords::WorldTileCoords, coords::WorldTileCoords,
io::{ io::{
source_client::{HttpSourceClient, SourceClient}, source_client::{HttpSourceClient, SourceClient},
transferables::Transferables, transferables::{DefaultTransferables, Transferables},
TileRequest, TileRequest,
}, },
Environment, HttpClient, Scheduler, Environment, HttpClient, Scheduler,

6
maplibre/src/stages/mod.rs
View File

@ -10,7 +10,6 @@ use std::{
use geozero::{mvt::tile, GeozeroDatasource}; use geozero::{mvt::tile, GeozeroDatasource};
use request_stage::RequestStage; use request_stage::RequestStage;
use crate::io::transferables::DefaultTransferables;
use crate::{ use crate::{
coords::{WorldCoords, WorldTileCoords, Zoom, ZoomLevel}, coords::{WorldCoords, WorldTileCoords, Zoom, ZoomLevel},
error::Error, error::Error,
@ -21,8 +20,9 @@ use crate::{
source_client::HttpSourceClient, source_client::HttpSourceClient,
tile_pipelines::build_vector_tile_pipeline, tile_pipelines::build_vector_tile_pipeline,
transferables::{ transferables::{
DefaultTessellatedLayer, DefaultTileTessellated, DefaultUnavailableLayer, DefaultTessellatedLayer, DefaultTileTessellated, DefaultTransferables,
TessellatedLayer, TileTessellated, Transferables, UnavailableLayer, DefaultUnavailableLayer, TessellatedLayer, TileTessellated, Transferables,
UnavailableLayer,
}, },
TileRequest, TileRequest,
}, },

5
maplibre/src/stages/request_stage.rs
View File

@ -12,18 +12,17 @@ use std::{
str::FromStr, str::FromStr,
}; };
use crate::io::apc::Message;
use crate::io::transferables::{Transferables, UnavailableLayer};
use crate::{ use crate::{
context::MapContext, context::MapContext,
coords::{ViewRegion, WorldTileCoords, ZoomLevel}, coords::{ViewRegion, WorldTileCoords, ZoomLevel},
error::Error, error::Error,
io::{ io::{
apc::{AsyncProcedureCall, AsyncProcedureFuture, Context, Input}, apc::{AsyncProcedureCall, AsyncProcedureFuture, Context, Input, Message},
pipeline::{PipelineContext, Processable}, pipeline::{PipelineContext, Processable},
source_client::{HttpSourceClient, SourceClient}, source_client::{HttpSourceClient, SourceClient},
tile_pipelines::build_vector_tile_pipeline, tile_pipelines::build_vector_tile_pipeline,
tile_repository::TileRepository, tile_repository::TileRepository,
transferables::{Transferables, UnavailableLayer},
TileRequest, TileRequest,
}, },
schedule::Stage, schedule::Stage,