Commit Graph

106 Commits

Author SHA1 Message Date
Dustin Carlino
67530bec07 Future-proof file organization by changing map_name from a string to a
struct. Whatever choices we make next about naming cities hierarchially
or not can be managed in just one place. #326

This is a pretty huge change, but the compiler gives reasonable
confidence it's correct. More bugs are likely to crop up in the next
step, when filenames start being namespaced by the city too.
2020-11-04 17:26:32 -08:00
Dustin Carlino
d0b26f56b4 Track file size of data files in the manifest too, to more easily notice when they change 2020-11-04 14:35:20 -08:00
Robin
edf5d0d8a9
Add Leeds (#375) 2020-11-03 10:53:14 -08:00
Dustin Carlino
c481567ebb Cut over from Dropbox to S3. #195, #326
Uploading files individually to Dropbox is flaky, and the unique URL per
file complicates data/MANIFEST.

While we're at it, start carving aside a directory structure for keeping
data for the last few releases.

[rebuild] to make sure github actions can download everything
2020-11-02 17:36:02 -08:00
Dustin Carlino
8920c2c0b8 Store gzipped files in S3 and decompress upon loading. A few basic tests
showed this is faster than downloading the uncompressed files, but of
course it probably depends on network speed vs CPU. #326

Also cut over the updater to use gzipped files using flate, instead of
single-file .zip's. [rebuild]
2020-10-31 18:09:48 -07:00
Dustin Carlino
eb7ee6d57d Fix a few build warnings and breaks, and document the headless server a
bit more
2020-10-14 10:46:18 -05:00
Dustin Carlino
2cd59ead37 Remove the special handling for synthetic maps, which were JSON RawMaps
that could directly be loaded. The few examples have been long broken
and unused. They complicate map loading, because they have a weird path.
2020-10-09 16:08:11 -07:00
Dustin Carlino
62b3af324b Bundle data/MANIFEST.json in wasm. Now loading all maps from HTTP works! #21 2020-10-08 14:41:02 -07:00
Dustin Carlino
fd004a59bf Fix a few broken dropbox links caused by doing the cutover in the previous commit 2020-10-08 13:57:49 -07:00
Dustin Carlino
d09ead3672 Use serde for data/MANIFEST 2020-10-08 13:14:40 -07:00
Dustin Carlino
989d5243b1 Move the data/manifest utils to abstutil, so the game crate can know
about all files that exist, even if they're not downloaded locally
(native) or to load other maps (web)
2020-10-08 12:50:18 -07:00
Dustin Carlino
f258c50595 Organize import blocks using https://github.com/dabreegster/organize_rust_imports 2020-10-05 20:29:22 -07:00
Dustin Carlino
597ef473f2 Upgrade most dependencies 2020-09-24 09:36:26 -07:00
Dustin Carlino
4576e9c1d0 Start importing a tiny slice of London, to start working on left-hand driving again 2020-09-03 16:09:17 -07:00
Dustin Carlino
8b7ad86647 Regularly import Tel Aviv! 2020-08-26 10:25:45 -07:00
Dustin Carlino
bd35260b0a updater was missing xian 2020-08-20 08:22:13 -07:00
Dustin Carlino
b4ad7400df stop drawing center lines for one-ways. while regenerating maps, also
bring in natural=scrub, and rename the krakow map
2020-07-31 20:48:26 -07:00
Dustin Carlino
10f8ddde48 better errors for updater failures. #213 2020-07-20 09:46:47 -07:00
Dustin Carlino
d16ac9713a new rust version. finally strip_prefix is available!
include berlin and krakow by default in the release, since they're small
and it'll make some collaboration easier [rebuild]
2020-07-16 08:41:28 -07:00
Dustin Carlino
0ad14d17ac settle on american spelling of center 2020-07-15 11:37:37 -07:00
Dustin Carlino
4a118c8103 import berlin city centre for #119 2020-07-15 09:42:45 -07:00
Dustin Carlino
0f82c21560 - manually fix a few crazy signals downtown.
- interpret tags to make 3rd Ave bus-only. cars technically allowed
  sometimes, but bus-only is more accurate for now.
- also remove austin from bundled maps. maintaining it has a cost, and
  the point was just to have at least one non-seattle city kept up to
  date.  krakow now satisfies that.
2020-07-13 13:40:46 -07:00
Dustin Carlino
3639379313 importer option to assume onstreet parking on some residential roads, if OSM doesnt say anything. give 50% of residential roads in krakow some parking. fixes #171
also clean up the seattle sidewalks dataset for now; the matching code
is quite bad, and not planning to use this anytime soon
2020-07-09 15:14:08 -07:00
Dustin Carlino
19409dfc8c add krakow as an optional city. need to specify more customization for #171, and given how much work is focused here, using the one-shot importer no longer makes sense 2020-07-09 14:33:39 -07:00
Dustin Carlino
6304abdcc8 make updater handle new screenshots format, and rm accidentally uploaded krakow map 2020-07-08 14:55:00 -07:00
Dustin Carlino
cac35319b2 handle off-side bike lanes on oneway roads. fixes #140 2020-07-06 14:03:22 -07:00
Dustin Carlino
d707969af5 remove mt_baker map and replace it with a much wider south_seattle map,
per request [rebuild]
2020-06-23 16:41:36 -07:00
Dustin Carlino
0358abe62b also use rust TLS for updater, so we dont need a dependency on libssl-dev 2020-06-23 15:41:09 -07:00
Dustin Carlino
27d3ec3538 fix dead dropbox links in input/. these shouldnt happen anymore. 2020-06-22 23:11:49 -07:00
Dustin Carlino
0c63062034 another attempt at fixing the updater [rebuild] 2020-06-22 17:04:01 -07:00
Dustin Carlino
a9b2a33ffc windows fixes:
- the updater script was clobbering clobber data/
- window resize events seem to capture title bar (#65)
[rebuild]
2020-06-22 15:51:42 -07:00
Dustin Carlino
be4daf421c figure out why some dropbox links are stale [rebuild] 2020-06-20 14:04:48 -07:00
Dustin Carlino
a9226e5ba9 use Brian's new rust-only updater to finally make self-contained windows
builds! will update the finalize script later [rebuild]
2020-06-10 16:20:16 -07:00
Dustin Carlino
906566c05b er, unbrick clicking on the minimap. and get rid of the uselss pan buttons [rebuild] 2020-06-10 14:10:55 -07:00
Brian Lewis
1f0da47fff
Remove curl, md5, and unzip shell dependencies (#60)
* remove unzip, md5, and curl shell dependencies

* update comment

* simplify reqwest call

* remove unecessary result return

* address PR comments

* fix md5 chunk reading

* remove unnecessary indexing
2020-06-10 13:58:16 -07:00
Dustin Carlino
6d436ef42a i should test updater first, sorry [rebuild] 2020-05-31 16:58:45 -07:00
Dustin Carlino
744eced75e argh, updater hasnt been including the city polygon [rebuild] 2020-05-31 16:09:11 -07:00
Dustin Carlino
b7790dca40 start doing screenshot diff tests for udistrict and downtown too 2020-05-29 08:00:59 -07:00
Dustin Carlino
feb7bc6409 adjust downtown boundary. remove redundant caphill and ID [rebuild] 2020-05-28 21:49:44 -07:00
Dustin Carlino
78a38a3fea slightly adjust lakeslice boundary. remove 23rd map. [rebuild] 2020-05-28 21:15:28 -07:00
Dustin Carlino
ca33695431 get rid of raw thruput_stats. in-game throughput plots are a little
different now, but everything's still usable, and this takes us down
from 342MB + 39MB to 74MB + 11MB for prebaked data! include lakeslice
prebaked results in releases now [rebuild]
2020-05-15 15:07:42 -07:00
Dustin Carlino
7ff5e870d0 fix loading edits when other edits are loaded. include west seattle in
release. [rebuild]
2020-05-15 12:25:02 -07:00
Dustin Carlino
d7df50ab37 make a one-command version of the importer. remove barranquilla and LA,
since they can just be handled by the oneshot tool, and arent being
actively used yet
2020-05-12 10:27:07 -07:00
Dustin Carlino
4a7ea37ee9 add missing amenities; the shop tag was being ignored 2020-05-12 09:28:14 -07:00
Dustin Carlino
e22b472a2d handle when dropbox sharelink fails in updater 2020-05-10 10:48:49 -07:00
Dustin Carlino
7f867fda70 trim down map file size a bit by not storing building OSM tags, which
weren't useful anyway. 873MB for all maps down to 786MB. huge_seattle
343MB to 305MB
2020-05-08 14:46:36 -07:00
Dustin Carlino
e97795044d edit existing polygons 2020-05-08 12:01:08 -07:00
Dustin Carlino
7dd392b27f make the prebaking a little more flexible; cut off lakeslice at noon for now 2020-05-05 12:31:00 -07:00
Dustin Carlino
9569fd6159 filter out access=no roads. removes the old 520 entrance that's causing lots of unrealistic border traffic in lakeslice. add a map to study west seattle 2020-05-05 09:46:03 -07:00
Dustin Carlino
7d2fa77323 grab turn restrictions across roads from OSM, plumb into RawMap 2020-05-03 10:41:00 -07:00
Dustin Carlino
a299498887 small fix with updater 2020-05-02 19:20:21 -07:00
Dustin Carlino
f1ac0dccc0 new city: Barranquilla 2020-05-02 15:43:19 -07:00
Dustin Carlino
f53220820f fixes for the uploader. [rebuild] 2020-05-02 15:19:50 -07:00
Dustin Carlino
57a2d4e88d tell updater what you want. cutover the github automation to try the new
tool... [rebuild]
2020-05-02 13:19:24 -07:00
Dustin Carlino
7f16ea879c the downloader half of the updater. grabs all files for now. 2020-05-01 22:44:38 -07:00
Dustin Carlino
43fe432e07 starting a tool to more granularly manage data files. my half, uploading 2020-05-01 19:22:03 -07:00