a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-29 04:35:51 +03:00
Code Issues Projects Releases Wiki Activity

switch back to upstream fast_graphs, using the new 32-bit wasm-friendly

Browse Source 
serialization. no measured performance impact. file sizes shrink!
This commit is contained in:
Dustin Carlino 2020-04-05 09:41:51 -07:00
parent 0bec946dce
commit f986dd8683
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/MANIFEST.txt
View File

@ -205,13 +205,13 @@ d02d0d103f7b00672a5f1145c5169d8c data/system/fonts/Overpass-Bold.ttf
2a13391023ce8787887331530cac35a7 data/system/fonts/BungeeInline-Regular.ttf 2a13391023ce8787887331530cac35a7 data/system/fonts/BungeeInline-Regular.ttf
17a1468e62195d0688a6f3bd12da2e92 data/system/fonts/Overpass-SemiBold.ttf 17a1468e62195d0688a6f3bd12da2e92 data/system/fonts/Overpass-SemiBold.ttf
259d4afad7edca07e727ef80f5bbce07 data/system/fonts/Bungee-Regular.ttf 259d4afad7edca07e727ef80f5bbce07 data/system/fonts/Bungee-Regular.ttf
b38a9172d4a3c5521c1bde089b87a4b5 data/system/maps/huge_seattle.bin c97768b6b014d1a9fb49f4560915ab7d data/system/maps/huge_seattle.bin
06e7705be021d6b236b4c90e9a8f4d35 data/system/maps/ballard.bin 08d407ab1b9688eee0b83cd65e698560 data/system/maps/ballard.bin
8f0915d1398fef700122bb9a0d0c8eda data/system/maps/downtown.bin e3634cc9018e4c30cba8a64eaec3c50d data/system/maps/downtown.bin
f3bd25e2994bf0fc9ec48ec4bf6adb42 data/system/maps/caphill.bin 511b8cd22bf463d5d26e1e23d314b376 data/system/maps/caphill.bin
72c8699530f040fe6deb37edfa4c21d2 data/system/maps/montlake.bin 30590c4756973ceb5f2ae0142c06b1b0 data/system/maps/montlake.bin
cb824a0243359190ca6f766329e074ef data/system/maps/intl_district.bin 750b8e4f996f12d4105a771e26e83192 data/system/maps/intl_district.bin
82893e68882460d11861afb65f4e6802 data/system/maps/23rd.bin 7fba5112973b3a5900536435945024de data/system/maps/23rd.bin
cc45f42cb24cad1cfdbf5ed7a0cb86d4 data/system/synthetic_maps/signal_double.json cc45f42cb24cad1cfdbf5ed7a0cb86d4 data/system/synthetic_maps/signal_double.json
8b949cc34d9a27ace0bd8ecde55a9520 data/system/synthetic_maps/signal_single.json 8b949cc34d9a27ace0bd8ecde55a9520 data/system/synthetic_maps/signal_single.json
1cd7be125e1d992613ed3a41e8b25b6a data/system/synthetic_maps/signal_fan_in.json 1cd7be125e1d992613ed3a41e8b25b6a data/system/synthetic_maps/signal_fan_in.json

2
map_model/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
aabb-quadtree = "0.1.0" aabb-quadtree = "0.1.0"
abstutil = { path = "../abstutil" } abstutil = { path = "../abstutil" }
fast_paths = { git = "https://github.com/dabreegster/fast_paths" } fast_paths = { git = "https://github.com/easbar/fast_paths" }
geom = { path = "../geom" } geom = { path = "../geom" }
gtfs = { path = "../gtfs" } gtfs = { path = "../gtfs" }
nbez = "0.1.0" nbez = "0.1.0"

3
map_model/src/pathfind/driving.rs
View File

@ -1,12 +1,13 @@
use crate::pathfind::node_map::{deserialize_nodemap, NodeMap}; use crate::pathfind::node_map::{deserialize_nodemap, NodeMap};
use crate::{Lane, LaneID, Map, Path, PathConstraints, PathRequest, PathStep, Turn, TurnID}; use crate::{Lane, LaneID, Map, Path, PathConstraints, PathRequest, PathStep, Turn, TurnID};
use fast_paths::{FastGraph, InputGraph, PathCalculator}; use fast_paths::{deserialize_32, serialize_32, FastGraph, InputGraph, PathCalculator};
use serde_derive::{Deserialize, Serialize}; use serde_derive::{Deserialize, Serialize};
use std::cell::RefCell; use std::cell::RefCell;
use thread_local::ThreadLocal; use thread_local::ThreadLocal;
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct VehiclePathfinder { pub struct VehiclePathfinder {
#[serde(serialize_with = "serialize_32", deserialize_with = "deserialize_32")]
graph: FastGraph, graph: FastGraph,
#[serde(deserialize_with = "deserialize_nodemap")] #[serde(deserialize_with = "deserialize_nodemap")]
nodes: NodeMap<LaneID>, nodes: NodeMap<LaneID>,

3
map_model/src/pathfind/walking.rs
View File

@ -3,7 +3,7 @@ use crate::pathfind::node_map::{deserialize_nodemap, NodeMap};
use crate::{ use crate::{
BusRouteID, BusStopID, LaneID, Map, Path, PathConstraints, PathRequest, PathStep, Position, BusRouteID, BusStopID, LaneID, Map, Path, PathConstraints, PathRequest, PathStep, Position,
}; };
use fast_paths::{FastGraph, InputGraph, PathCalculator}; use fast_paths::{deserialize_32, serialize_32, FastGraph, InputGraph, PathCalculator};
use geom::{Distance, Speed}; use geom::{Distance, Speed};
use serde_derive::{Deserialize, Serialize}; use serde_derive::{Deserialize, Serialize};
use std::cell::RefCell; use std::cell::RefCell;
@ -11,6 +11,7 @@ use thread_local::ThreadLocal;
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct SidewalkPathfinder { pub struct SidewalkPathfinder {
#[serde(serialize_with = "serialize_32", deserialize_with = "deserialize_32")]
graph: FastGraph, graph: FastGraph,
#[serde(deserialize_with = "deserialize_nodemap")] #[serde(deserialize_with = "deserialize_nodemap")]
nodes: NodeMap<Node>, nodes: NodeMap<Node>,