Commit Graph

124 Commits

Author SHA1 Message Date
Dustin Carlino
1e73baa078 start remembering osm_node_ids for intersections 2019-09-20 15:17:54 -07:00
Dustin Carlino
a130f876f9 more validations for merging short roads 2019-09-20 14:36:53 -07:00
Dustin Carlino
3a8752d2e9 less dumb raw_data mutation API. take stable IDs, which synthetic model already has and apply_fixes computes anyway 2019-09-20 14:13:08 -07:00
Dustin Carlino
9d077c8081 moving remainder of mutations from model to raw_data 2019-09-20 13:54:51 -07:00
Dustin Carlino
e1988e56e5 recording fixes inside raw map. simplifying model's way of managing all fixes 2019-09-20 13:14:28 -07:00
Dustin Carlino
b9ac8021d0 making first-class mutations on raw map, so synthetic model does less
work. not porting over the mutations not preserved by fixes yet, and
also not actually recording fixes for the moment...
2019-09-20 13:06:29 -07:00
Dustin Carlino
0ae0a88abb actually, serialize MapFixes as json for now. will switch to binary when this is large later, but for now, this is easier to handle schema changes and debug. 2019-09-19 14:39:31 -07:00
Dustin Carlino
1599507934 support for merging short roads in synthetic editor. the fix gets
applied later by very painfully copying logic and doing a slow thing.
2019-09-19 14:03:04 -07:00
Dustin Carlino
3eb9acf0aa plumb parking lane hints around through tags too; simplifies a few places 2019-09-19 13:30:07 -07:00
Dustin Carlino
62d1777433 getting rid of structopt in more crates 2019-09-18 16:50:32 -07:00
Dustin Carlino
fac8d4d9ff remember tag overrides for osm roads in fixes 2019-09-18 15:25:52 -07:00
Dustin Carlino
125a8fde98 support for modifying individual existing points of a road. no attempt to save these changes reasonably yet. 2019-09-18 11:39:25 -07:00
Dustin Carlino
3fd74673cf edit name and speed limit of a synthetic road 2019-09-18 11:15:06 -07:00
Dustin Carlino
bc7c9cb692 deleting a synthetic created thing is modeled more simply 2019-09-18 10:53:18 -07:00
Dustin Carlino
d86f4a6e89 separate files for groups of fixes 2019-09-18 10:48:17 -07:00
Dustin Carlino
6f1ac3969e organizing osm keys 2019-09-17 17:14:09 -07:00
Dustin Carlino
e52fa1fc1a recording and applying fixes to create new synthetic intersections and roads 2019-09-17 16:16:19 -07:00
Dustin Carlino
1e4f36dec1 duplicate OSM ids in tag maps universally, to simplify some other places 2019-09-17 15:37:11 -07:00
Dustin Carlino
ed29a208e4 adjust roads when moving intersections 2019-09-17 14:02:02 -07:00
Dustin Carlino
e32b540f54 draw boundary polygon, and deal with matching orig IDs that run right up
against the map boundary
2019-09-17 13:56:15 -07:00
Dustin Carlino
e2b3be66d5 improve raw road -> lane geometry 2019-09-17 13:34:07 -07:00
Dustin Carlino
eee5981c14 stable IDs for buildings in raw layer too. stop futzing with ID problems there. 2019-09-17 13:11:08 -07:00
Dustin Carlino
33ab7d4553 a big cutover -- synthetic model is just a thin wrapper on a raw_data map. mostly everything works! 2019-09-17 12:55:33 -07:00
Dustin Carlino
0e406afe0f store name in raw map; simplifies some plumbing elsewhere 2019-09-17 10:27:32 -07:00
Dustin Carlino
030191ef31 fixed OriginalRoads, which were pretty much always wrong (not split from
the original OSM way). also handle cul-de-sacs.
2019-09-17 09:29:19 -07:00
Dustin Carlino
88b18bfb9a remember which roads are created from scratch, color differently 2019-09-16 12:39:55 -07:00
Dustin Carlino
572c69175c apply fixes to raw_data in synthetic crate and when creating the full map model. adjusting some LonLat matches to do approx_eq. not stable yet -- sometimes we leave a road connected to something missing. 2019-09-16 12:31:15 -07:00
Dustin Carlino
3e8a825ac1 recording changes from synthetic crate 2019-09-16 10:56:45 -07:00
Dustin Carlino
4a12cdd36a easy way to select and delete big chunk of stuff in synthetic 2019-09-16 10:16:56 -07:00
Dustin Carlino
af11fa4212 adjust synthetic crate -- just a binary, not also a library 2019-09-14 13:34:02 -07:00
Dustin Carlino
f36885eb2f synthetic: redo mouseover after swapping lanes, strip out synthetic osm
tags from display, skip dupe roads between same intersections
2019-09-14 10:49:45 -07:00
Dustin Carlino
1248dac270 nicer API for appending bits of text 2019-09-13 15:23:25 -07:00
Dustin Carlino
95545863fc display OSM tags and road names in synthetic. it's slowly becoming like fix_map_geom, i bet 2019-09-13 14:55:14 -07:00
Dustin Carlino
dd6db94fa0 derp, synthetic was swallowing all events -- even text box entry -- when cursor is on covered areas -- like, say, the text box 2019-09-12 11:20:07 -07:00
Dustin Carlino
180fdd1412 builder API for World. restoring synthetic labels 2019-09-12 11:11:31 -07:00
Dustin Carlino
672899c20f better synthetic drawing: lanes offset properly (still buggy...), draw center line 2019-09-12 10:25:34 -07:00
Dustin Carlino
353d89cd25 more synthetic fixes: redo mouseover when model changes, avoid panic
with 0-len new road line, fix reused IDs, fix contains_pt for
some precomputed polygons
2019-09-12 09:54:12 -07:00
Dustin Carlino
92a4f304f7 restoring functionality to synthetic: changing stuff updates the world 2019-09-11 17:08:11 -07:00
Dustin Carlino
cb7121162b folding viewer into ezgui crate 2019-09-11 15:27:12 -07:00
Dustin Carlino
5558d8803c push current_selection state into World, simplify API 2019-09-11 14:55:54 -07:00
Dustin Carlino
548bb3b812 convert synthetic to viewer, resulting in much better perf and less code 2019-09-11 14:37:24 -07:00
Dustin Carlino
43de343372 stop serializing synthetic's model format, just save raw_data maps 2019-09-11 13:52:49 -07:00
Dustin Carlino
c3ae6bf8f8 ditch quadtrees in synthetic crate. if anything, switch later to
viewer's World
2019-09-11 13:34:41 -07:00
Dustin Carlino
9ed38c849c be able to flag off using textures, and sub a fallback color. also move texture loading into the loading screen. and fix the release script 2019-09-10 17:04:33 -07:00
Dustin Carlino
9a624397e0 supporting up to 10 textures 2019-09-10 15:44:07 -07:00
Dustin Carlino
08b18b682d overhaul Text API to builder pattern 2019-09-06 13:58:04 -07:00
Dustin Carlino
636e6328cb fix up synthetic's boundary_polygon, and remove more dead geom code 2019-08-26 16:04:26 -07:00
Dustin Carlino
0a39f4bd77 get rid of the coordinates_in_world_space hack; synthetic can just directly work in Pt2Ds now 2019-08-26 15:57:28 -07:00
Dustin Carlino
9fac44e28b fix roundabout handling. clearing out hints, because many no longer
apply with the back-and-forth gps/pt2d stuff... reasonable to reset
efforts anyway, now that I'm considering patching in OSM edits instead
2019-08-26 14:40:47 -07:00
Dustin Carlino
114a76893a now raw_data::Road 2019-08-26 13:59:10 -07:00