a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-24 17:37:22 +03:00
Code Issues Projects Releases Wiki Activity

Don't store Rings for Polygons without any holes. Total map size from 751MB to 743MB

Browse Source
This commit is contained in:
Dustin Carlino 2020-09-04 12:18:53 -07:00
parent 193a3b1515
commit 568a64df91
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
data/MANIFEST.txt
View File

@ -72,20 +72,20 @@ data/input/xian/footways.bin,425becbab867631415fe49edcf8f9694,https://www.dropbo
data/input/xian/osm/china-latest.osm.pbf,0108807f1dc321d5de5579622ac3f4cf,https://www.dropbox.com/s/qewwxtioocbv3ld/china-latest.osm.pbf.zip?dl=0 data/input/xian/osm/china-latest.osm.pbf,0108807f1dc321d5de5579622ac3f4cf,https://www.dropbox.com/s/qewwxtioocbv3ld/china-latest.osm.pbf.zip?dl=0
data/input/xian/osm/xian.osm,4084c665ad947bb40173a43cb33fdec8,https://www.dropbox.com/s/j5qwt33bs077sd2/xian.osm.zip?dl=0 data/input/xian/osm/xian.osm,4084c665ad947bb40173a43cb33fdec8,https://www.dropbox.com/s/j5qwt33bs077sd2/xian.osm.zip?dl=0
data/input/xian/service_roads.bin,2130675f49282a5e9fe3db870b089e98,https://www.dropbox.com/s/5djufzeqgdp43ek/service_roads.bin.zip?dl=0 data/input/xian/service_roads.bin,2130675f49282a5e9fe3db870b089e98,https://www.dropbox.com/s/5djufzeqgdp43ek/service_roads.bin.zip?dl=0
data/system/cities/seattle.bin,91f8ed0b5da81b5f757448a2a2e7da89,https://www.dropbox.com/s/8fnapw0rcxo54kk/seattle.bin.zip?dl=0 data/system/cities/seattle.bin,968a7501c357fdf86923780e685e8beb,https://www.dropbox.com/s/0hp2y93byah7rwj/seattle.bin.zip?dl=0
data/system/maps/ballard.bin,a30729616ad7bd1fe00b624c5a0aeeaf,https://www.dropbox.com/s/zg4ujpiwzrwb3w2/ballard.bin.zip?dl=0 data/system/maps/ballard.bin,b8eaa118837135a682804615d4a073f2,https://www.dropbox.com/s/o7cqvja58otgp9f/ballard.bin.zip?dl=0
data/system/maps/berlin_center.bin,eb7398f8c4933cc927ef653a0e47a1e7,https://www.dropbox.com/s/ccf5z56plcrm1nc/berlin_center.bin.zip?dl=0 data/system/maps/berlin_center.bin,18e1f9e936f3894e1eb23074700424dc,https://www.dropbox.com/s/6tvnvl7cw0a4o3g/berlin_center.bin.zip?dl=0
data/system/maps/downtown.bin,20efae9377afec32812b31827a887083,https://www.dropbox.com/s/cqiyk2cekbwds01/downtown.bin.zip?dl=0 data/system/maps/downtown.bin,ddf28f06b5429b5e80c8dc2ab3b1038d,https://www.dropbox.com/s/0zlltu36mh68j4i/downtown.bin.zip?dl=0
data/system/maps/huge_seattle.bin,b6b5c99b27d9d768bc0fb6aef98c776f,https://www.dropbox.com/s/t2ssq6xdtchxyv5/huge_seattle.bin.zip?dl=0 data/system/maps/huge_seattle.bin,544e22eb6715d2a21930c6dd85f07d12,https://www.dropbox.com/s/ppmkrzovixriiic/huge_seattle.bin.zip?dl=0
data/system/maps/krakow_center.bin,7e423da356c1671ea09d2527575fce5c,https://www.dropbox.com/s/fwkktv545su6no0/krakow_center.bin.zip?dl=0 data/system/maps/krakow_center.bin,218b0b1aecf209c53fe69cff95ddf46b,https://www.dropbox.com/s/6wvpla6zs3ohs0w/krakow_center.bin.zip?dl=0
data/system/maps/lakeslice.bin,c117a20d21a7c68ceae775c6c1daf318,https://www.dropbox.com/s/sss05ts43u8ghb8/lakeslice.bin.zip?dl=0 data/system/maps/lakeslice.bin,fc9bc99d233c8358bf4f894dcc3673fa,https://www.dropbox.com/s/1df6wmrcujtmkv3/lakeslice.bin.zip?dl=0
data/system/maps/montlake.bin,6ca284783ce83e915282476cf99e04cc,https://www.dropbox.com/s/wyybiw5y7z3gdoc/montlake.bin.zip?dl=0 data/system/maps/montlake.bin,20fb5f9b26a9cd21552fde3049dc3c53,https://www.dropbox.com/s/x17lo3mp9k3zyog/montlake.bin.zip?dl=0
data/system/maps/south_seattle.bin,286ce475d0d4a93501d7f9af6fff6418,https://www.dropbox.com/s/y505pnkwxyyrw0f/south_seattle.bin.zip?dl=0 data/system/maps/south_seattle.bin,1e3fe1f32f594004d6d9c2871ef42ebc,https://www.dropbox.com/s/49gpjjekiuajc46/south_seattle.bin.zip?dl=0
data/system/maps/southbank.bin,dc5b1f91ae0e477aea5b4bdcb56e2e2c,https://www.dropbox.com/s/06v1x7enu00pmds/southbank.bin.zip?dl=0 data/system/maps/southbank.bin,1220b154483860601249c48137539ae0,https://www.dropbox.com/s/aqeely5v879j7ff/southbank.bin.zip?dl=0
data/system/maps/tel_aviv.bin,b273e64c3e2ded4134f46bce6d9992cf,https://www.dropbox.com/s/7hndvhud5x8xao5/tel_aviv.bin.zip?dl=0 data/system/maps/tel_aviv.bin,dbfdc48fa11f4611c8beaae372c3fad1,https://www.dropbox.com/s/pvplzf56z919ji2/tel_aviv.bin.zip?dl=0
data/system/maps/udistrict.bin,d2773d20a171843b7b6c805f350d4cf5,https://www.dropbox.com/s/y03l06emjmtjp32/udistrict.bin.zip?dl=0 data/system/maps/udistrict.bin,b62472bd1f21f6316ed768aa9fe4d866,https://www.dropbox.com/s/6lsd71gadj4jhtu/udistrict.bin.zip?dl=0
data/system/maps/west_seattle.bin,df580b7566bb9d57a2605cf4affa741d,https://www.dropbox.com/s/a9ws18sar0l5tns/west_seattle.bin.zip?dl=0 data/system/maps/west_seattle.bin,c99d8e870b477c593dfec387e6c4630a,https://www.dropbox.com/s/zdc1v3nbw35oogx/west_seattle.bin.zip?dl=0
data/system/maps/xian.bin,fe0b3775cc141c735870104b70339db0,https://www.dropbox.com/s/w7g13kgn8a1girv/xian.bin.zip?dl=0 data/system/maps/xian.bin,5e92cbd875fd4f7fa4eeabc3d06dd2bd,https://www.dropbox.com/s/5xencguo9ustv7n/xian.bin.zip?dl=0
data/system/prebaked_results/lakeslice/weekday.bin,3e640d22ff8d32889789e0373085543c,https://www.dropbox.com/s/cw9igcxi0ljhz3z/weekday.bin.zip?dl=0 data/system/prebaked_results/lakeslice/weekday.bin,3e640d22ff8d32889789e0373085543c,https://www.dropbox.com/s/cw9igcxi0ljhz3z/weekday.bin.zip?dl=0
data/system/prebaked_results/montlake/car vs bike contention.bin,5928aa529033e398fe6d256afe21c2ab,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0 data/system/prebaked_results/montlake/car vs bike contention.bin,5928aa529033e398fe6d256afe21c2ab,https://www.dropbox.com/s/jefg0ikjy9dsrdd/car%20vs%20bike%20contention.bin.zip?dl=0
data/system/prebaked_results/montlake/weekday.bin,bcd77a7b5187ee4839833d932cf52a41,https://www.dropbox.com/s/4g21l6rbynvs3tu/weekday.bin.zip?dl=0 data/system/prebaked_results/montlake/weekday.bin,bcd77a7b5187ee4839833d932cf52a41,https://www.dropbox.com/s/4g21l6rbynvs3tu/weekday.bin.zip?dl=0

1
data/regen.sh
View File

@ -7,6 +7,7 @@ rm -fv data/system/maps/huge_seattle.bin data/input/raw_maps/huge_seattle.bin da
./import.sh --raw --map --scenario ./import.sh --raw --map --scenario
./import.sh --raw --map --city=berlin ./import.sh --raw --map --city=berlin
./import.sh --raw --map --city=krakow ./import.sh --raw --map --city=krakow
./import.sh --raw --map --city=london
./import.sh --raw --map --city=tel_aviv ./import.sh --raw --map --city=tel_aviv
./import.sh --raw --map --city=xian ./import.sh --raw --map --city=xian

7
geom/src/polygon.rs
View File

@ -11,8 +11,9 @@ pub struct Polygon {
// Groups of three indices make up the triangles // Groups of three indices make up the triangles
indices: Vec<usize>, indices: Vec<usize>,
// If the polygon has holes, explicitly store all the rings so they can later be used to // If the polygon has holes, explicitly store all the rings (the one outer and all of the
// generate outlines and such. // inner) so they can later be used to generate outlines and such. If the polygon has no holes,
// then this will just be None, since the points form a ring.
rings: Option<Vec<Ring>>, rings: Option<Vec<Ring>>,
} }
@ -56,7 +57,7 @@ impl Polygon {
.map(|pair| Pt2D::new(pair[0], pair[1])) .map(|pair| Pt2D::new(pair[0], pair[1]))
.collect(), .collect(),
indices, indices,
rings: Some(inner), rings: if inner.len() == 1 { None } else { Some(inner) },
} }
} }

2
map_model/src/make/walking_turns.rs
View File

@ -232,7 +232,7 @@ fn _new_make_walking_turns(
id: turn_id(i.id, l2.id, l1.id), id: turn_id(i.id, l2.id, l1.id),
turn_type: TurnType::SharedSidewalkCorner, turn_type: TurnType::SharedSidewalkCorner,
other_crosswalk_ids: BTreeSet::new(), other_crosswalk_ids: BTreeSet::new(),
geom: geom, geom,
}); });
from = Some(l2); from = Some(l2);