Commit Graph

843 Commits

Author SHA1 Message Date
Ansis Brammanis
35cefceba6 Fix partial redraws 2013-01-30 17:43:14 -05:00
Ansis Brammanis
9862238a84 Fix graph.rebase() 2013-01-30 17:04:51 -05:00
Ansis Brammanis
b73d18cbf5 Merge remote-tracking branch 'systemed/master' into graph-perf2 2013-01-30 16:58:44 -05:00
John Firebaugh
e4c513ae87 midpoint = true -> type = 'midpoint'
Makes it more consistent with entities.
2013-01-30 16:24:33 -05:00
John Firebaugh
363cd53af1 Rearrange code 2013-01-30 16:17:30 -05:00
John Firebaugh
168a3b5e26 Fix drawing on midpoints (fixes #559) 2013-01-30 16:14:29 -05:00
John Firebaugh
dbac370c71 More draw refactoring 2013-01-30 16:14:29 -05:00
Ansis Brammanis
2fa48df9a1 Small parentWays, parentRelations perf improvements 2013-01-30 16:09:15 -05:00
John Firebaugh
e381b6ab26 Extract AddMidpoint action 2013-01-30 15:47:33 -05:00
John Firebaugh
459dc00ce5 Change the midpoint data a bit
Store the ways which share the segment and the index of
the segment. This will be used in both DragWay and Draw
behaviors.
2013-01-30 15:47:33 -05:00
Ansis Brammanis
a317859b0f Don't re-add removed parentways, don't duplicate 2013-01-30 15:44:03 -05:00
Saman Bemel-Benrud
b50160b4d9 more screwing around with button styles. 2013-01-30 15:29:10 -05:00
Ansis Brammanis
1b5a1b8268 Merge takes an entities object, not graph 2013-01-30 14:20:39 -05:00
Ansis Brammanis
5a35b6bfa4 Fix difference 2013-01-30 14:11:54 -05:00
Ansis Brammanis
e08364d492 working parentRels 2013-01-30 13:18:44 -05:00
Ansis Brammanis
ba68a238fe Working rebase 2013-01-30 12:26:40 -05:00
John Firebaugh
217577da95 Exit MoveWay mode on undo (fixes #562) 2013-01-30 12:02:49 -05:00
John Firebaugh
6576ec6501 Operation sprites 2013-01-30 11:56:49 -05:00
Tom MacWright
30d7296a00 Relative path for loader 2013-01-30 11:38:53 -05:00
Saman Bemel-Benrud
ec4f4266ad fix overflow in commit dialog. 2013-01-30 11:27:03 -05:00
Tom MacWright
38743a602f Merge branch 'master' of github.com:systemed/iD 2013-01-29 18:48:55 -05:00
Tom MacWright
f6415e3b2d Merge branch 'translation' 2013-01-29 18:48:11 -05:00
John Firebaugh
2008fa1d92 Don't show an empty menu 2013-01-29 18:45:10 -05:00
John Firebaugh
f31dcd32a2 Add keybindings for all operations 2013-01-29 18:45:10 -05:00
John Firebaugh
9b2860d01a Futuristic radial menu tooltips 2013-01-29 18:45:10 -05:00
John Firebaugh
6559b7015f Futuristic radial menu (fixes #548) 2013-01-29 18:45:10 -05:00
Saman Bemel-Benrud
2115e673f4 button style improvements, modal positioning fix. 2013-01-29 18:38:22 -05:00
Tom MacWright
4ed44ef9f0 Micro translation framework. 2013-01-29 18:34:40 -05:00
Tom MacWright
699041019f Pan map when dragging to pad. Fixes #534 2013-01-29 17:02:56 -05:00
Ansis Brammanis
6c1e4e5b4d Working more-efficient parentWays 2013-01-29 13:32:39 -05:00
Saman Bemel-Benrud
9c158c99f1 Merge branch 'master' of github.com:systemed/iD 2013-01-29 13:24:16 -05:00
Saman Bemel-Benrud
6d6d3ce7fe better user icon style. 2013-01-29 13:23:52 -05:00
John Firebaugh
65baf36143 Remove unused DragWay behavior 2013-01-29 13:19:04 -05:00
John Firebaugh
03de3ffba6 Move operation (fixes #536) 2013-01-29 13:18:23 -05:00
Ansis Brammanis
7d32af5264 work towards using prototypes for entities 2013-01-29 12:49:00 -05:00
John Firebaugh
69d95a6082 Refactor operations
They're something distinct from actions. Actions are independent
of UI, operations are actions + UI (title, keybinding, modality,
etc.)
2013-01-29 12:05:52 -05:00
John Firebaugh
b37ef978f4 Snap to ways/vertices/midpoints when drawing (#240)
Also add anti-snapping behavior when option key is down.
2013-01-29 11:16:12 -05:00
Saman Bemel-Benrud
b13e6d13d9 copy tweaks. 2013-01-28 21:08:40 -05:00
Saman Bemel-Benrud
adf933004a Merge branch 'master' of github.com:systemed/iD 2013-01-28 21:06:17 -05:00
Saman Bemel-Benrud
6cb1692e44 radial menu source, better user icon commit modal integration, small fixes. 2013-01-28 21:06:07 -05:00
Ansis Brammanis
541ff96af6 Close modals with esc or backspace 2013-01-28 17:46:25 -05:00
John Firebaugh
8fe9da4710 Mode name and shortcut key should match 2013-01-28 17:29:21 -05:00
John Firebaugh
5d73e45b50 Fix exiting draw mode via other means (fixes #503) 2013-01-28 17:26:14 -05:00
Ansis Brammanis
d998b000d5 Fix midpoint dragging, break multiple touch drags 2013-01-28 17:02:07 -05:00
John Firebaugh
3c99d36a76 Fix differenced redraw artifacts during pan/zoom
Fixes #543.
2013-01-28 16:55:30 -05:00
Tom MacWright
11ddcdd568 Merge branch 'master' of github.com:systemed/iD 2013-01-28 16:41:36 -05:00
Tom MacWright
7acca8e6d2 Reformat success page. Fixes #532 2013-01-28 16:41:25 -05:00
John Firebaugh
859ae1c1cc DrawWay#cancel shouldn't unconditionally delete the way
Fixes #514.
2013-01-28 16:39:31 -05:00
Tom MacWright
2f44df09d5 Merge branch 'master' of github.com:systemed/iD 2013-01-28 16:19:00 -05:00
Tom MacWright
6ae683dedc Hints for keybindings. Refs #517 2013-01-28 16:18:49 -05:00