Commit Graph

203 Commits

Author SHA1 Message Date
Tom MacWright 189412398e Merge pull request #673 from systemed/lasso
Lasso
2013-02-07 13:36:54 -08:00
John Firebaugh 5cad057212 Clear selection on esc (fixes #643) 2013-02-07 13:36:19 -08:00
Tom MacWright f0b761b979 Lasso action 2013-02-07 16:21:25 -05:00
Ansis Brammanis a4bf7c689f Merge DragNode and DragMidpoint
Adds shared behaviors such as snapping to DragMidpoint
2013-02-06 10:49:58 -05:00
Tom MacWright 42f2cebab3 Merge branch 'master' of github.com:systemed/iD 2013-02-05 19:09:42 -05:00
Tom MacWright 8f17628190 Support nudging while moving ways. Fixes #533 2013-02-05 19:09:22 -05:00
John Firebaugh 5eb0644242 Improve multipolygon rendering
Multipolygon relations report their geometry as 'area' and are rendered
as such. However, they do not render a stroke. The stroke rendering
will come from the individual lines, which are given the tag
classes of their parent relations, allowing them to have a stroke
style matching the style of simple areas with the same tags.

Untagged circular ways are no longer considered areas. This prevents
an untagged inner way of a multipolygon from rendering as an area and
is consistent with how P2 and JOSM treat them.

In the CSS, it's no longer necessary to deal with multipolygons
explicitly in selectors. But keep in mind that area boundaries can
now be rendered either as lines or as area strokes. In most cases
the selector should be `path.stroke.tag-_____`, i.e. an explicit
`.area` or `.line` classes should not be included.

Finally, the parent ways of selected multipolygons are given the 'selected'
class.
2013-02-05 15:20:11 -08:00
Ansis Brammanis bc6238c2be Use AddMidpoint when doubleclicking on way 2013-02-05 14:52:05 -05:00
Ansis Brammanis 2d4f477265 dblclick a shared way adds vertex to all ways 2013-02-05 14:11:03 -05:00
Tom MacWright db7f42145e Continue removing any non-scoped selectors. Refs #595
Last hits will be combobox and layerswitcher.
2013-02-05 12:00:10 -05:00
Ansis Brammanis 3576a99eb5 Always have delete as first op 2013-02-05 11:00:13 -05:00
Ansis Brammanis 915bcf7826 Fix drawing, leaking globals 2013-02-05 00:41:07 -05:00
Ansis Brammanis c8ab057f19 Remove unused midpoint code 2013-02-04 18:26:45 -05:00
Tom MacWright 3d8f2ffb84 Consistify syntax 2013-02-04 16:08:34 -05:00
John Firebaugh 09dac581be Fix MoveWay mode (fixes #602) 2013-02-02 12:55:20 -05:00
John Firebaugh 7235632a63 Update logic for multi-select 2013-02-01 15:13:44 -05:00
John Firebaugh fe49e8fb77 Pass around context rather than map 2013-02-01 12:40:16 -05:00
John Firebaugh 579d632563 Hoist functions up a scope 2013-02-01 12:40:15 -05:00
John Firebaugh 7e68e8e114 Add iD.Context
This is a facade interface that ties together a bunch of
different internal objects and will make it easier to write
tests for behaviors, modes, and operations.
2013-02-01 12:40:15 -05:00
Ansis Brammanis f430ecd622 Fix keyboard-initiated way moving 2013-01-31 17:12:37 -05:00
John Firebaugh 5f41b74955 Remove controller.exit 2013-01-31 16:00:02 -05:00
John Firebaugh 7ea7326f92 Extract Select behavior 2013-01-31 15:56:24 -05:00
John Firebaugh 402a9424c0 Make selection an array of entity IDs
Should have no visible effect yet.
2013-01-31 13:51:12 -05:00
John Firebaugh df72ef254f ChangeEntityTags -> ChangeTags 2013-01-31 12:07:54 -05:00
John Firebaugh 6f7079d11c AddWay/AddNode -> AddEntity 2013-01-31 12:06:21 -05:00
John Firebaugh 1bfe1359ec AddWayNode -> AddVertex 2013-01-31 12:06:21 -05:00
John Firebaugh 2655810efe Remove unused parameter 2013-01-31 12:06:21 -05:00
John Firebaugh 7e8126ded9 I18n for modes and operations 2013-01-31 11:20:41 -05:00
Saman Bemel-Benrud 1b495870c0 grammar for tooltips, keybinding hints, other tooltip fixes. 2013-01-30 19:09:10 -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
John Firebaugh 217577da95 Exit MoveWay mode on undo (fixes #562) 2013-01-30 12:02:49 -05:00
John Firebaugh f31dcd32a2 Add keybindings for all operations 2013-01-29 18:45:10 -05:00
John Firebaugh 03de3ffba6 Move operation (fixes #536) 2013-01-29 13:18:23 -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 8fe9da4710 Mode name and shortcut key should match 2013-01-28 17:29:21 -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 6ae683dedc Hints for keybindings. Refs #517 2013-01-28 16:18:49 -05:00
John Firebaugh 46cb57cea7 No double click on area fill (fixes #518) 2013-01-26 16:43:46 -05:00
John Firebaugh e09666bbdc Fixing draw mode bugs
Disabling interactive draw undo for now. I know how to fix it
but it's a bit tricky. So undo will just drop you out to browse
mode for the time being.

Fixes #477.
Fixes #516.
2013-01-26 15:24:14 -05:00
Tom MacWright deebe55182 Allow for continuing line drawing, also fixes #507 2013-01-25 16:28:21 -05:00
Tom MacWright 1f3319f7b0 Add circularize action. Fixes #491 2013-01-24 22:52:19 -05:00
John Firebaugh 923fb86f06 Revert menu placement on way
Can't do this until we can distinguish area fill from stroke.
2013-01-24 19:13:42 -05:00
John Firebaugh 454cf0b16c Close menu on map move (fixes #482) 2013-01-24 19:07:05 -05:00
John Firebaugh 3f7b7c6a5a Hide menu on history changes 2013-01-24 18:45:36 -05:00
John Firebaugh 66a0d0bdbd Center the radial menu on entities (fixes #483)
Also, don't show it when finishing draw operations.
2013-01-24 18:45:36 -05:00
John Firebaugh dd03544a00 Extract AddWay behavior 2013-01-24 18:04:40 -05:00
Tom MacWright 2527d57404 Simple map-tail minimalism. Fixes #467 2013-01-24 17:26:52 -05:00
John Firebaugh d83eb7647a Connect areas to lines (fixes #476) 2013-01-24 17:04:24 -05:00