16273 Commits

Author SHA1 Message Date
Tom MacWright
6a7e508f9e Merge branch 'master' into lasso 2013-02-07 16:22:11 -05:00
Tom MacWright
f0b761b979 Lasso action 2013-02-07 16:21:25 -05:00
Ansis Brammanis
02d4b8f1aa Remove unnecessary code from orthogonalize 2013-02-07 15:48:32 -05:00
Tom MacWright
b9d80538b1 jshinting 2013-02-07 15:41:14 -05:00
Ansis Brammanis
9a2bafac1b Power through less square iterations 2013-02-07 15:30:44 -05:00
Ansis Brammanis
cf96055781 Fix scale calculation in orthogonalize 2013-02-07 14:08:07 -05:00
Ansis Brammanis
ec152716fb Fix calls to ui.flash 2013-02-07 01:16:51 -05:00
Ansis Brammanis
4f6637d58b Fix add_point tests (switch back to mouseup) 2013-02-06 19:11:28 -05:00
John Firebaugh
0af51a0ef6 Improvements to Split
* Split a closed way at selected and antipode point (fixes #651)
* Split an area into a multipolygon (fixes #572)
2013-02-06 16:00:19 -08:00
Ansis Brammanis
246481ad92 Switch back to mouseup, and block following click 2013-02-06 18:53:46 -05:00
Tom MacWright
ce53a9233a Remove unscoped d3.select 2013-02-06 18:11:50 -05:00
Ansis Brammanis
2ca4387f74 Fix snapping nodes to areas
In the future it may be good to use shadow paths, but at this point
there isn't really a reason to add thousands of additional paths.
2013-02-06 17:42:51 -05:00
Tom MacWright
8008034697 Merge pull request #665 from systemed/dynamic-layers
Dynamic layers
2013-02-06 14:41:21 -08:00
Tom MacWright
c84e0713d9 Merge branch 'master' into dynamic-layers
Conflicts:
	js/id/renderer/background_source.js
	js/id/ui/layerswitcher.js
2013-02-06 17:39:55 -05:00
Tom MacWright
4b5dcd054e Fix sourcetag regression 2013-02-06 17:34:41 -05:00
John Firebaugh
f6e726bcd6 Join should run Reverse where necessary (fixes #652) 2013-02-06 14:31:11 -08:00
Tom MacWright
e868c071ac Remove more unreliable or slow layers, select the right layer initially,
fix null tooltips
2013-02-06 17:16:00 -05:00
John Firebaugh
104b02eda1 Move common setup to spec_helpers.js 2013-02-06 14:04:19 -08:00
John Firebaugh
bd8c9d6a00 Support merging points into an area (#435) 2013-02-06 13:42:34 -08:00
John Firebaugh
d7639acb22 Set up iD.actions.Join to be more flexible 2013-02-06 13:42:34 -08:00
John Firebaugh
53ed9df2b7 A no-op Graph#replace should not create a new graph
This is useful for reducing graph churn.
2013-02-06 13:42:34 -08:00
John Firebaugh
b62f106be8 Extract Relation#replaceMember 2013-02-06 13:42:34 -08:00
Tom MacWright
d89968d30d Add discard tags action 2013-02-06 16:23:06 -05:00
Tom MacWright
3440f4254d Discard tags 2013-02-06 16:22:39 -05:00
Tom MacWright
4a07c42d2b Merge branch 'master' of github.com:systemed/iD 2013-02-06 15:51:52 -05:00
Tom MacWright
fbe3a41d57 Update tests for faux click events in more places. 2013-02-06 15:47:16 -05:00
Ansis Brammanis
83224d0f87 imagery_used includes full custom template 2013-02-06 15:38:20 -05:00
Tom MacWright
b11e50048e Merge branch 'master' of github.com:systemed/iD 2013-02-06 15:09:51 -05:00
Tom MacWright
a9632a2c7a Do not trigger radial on double click 2013-02-06 15:09:40 -05:00
Ansis Brammanis
0acab34054 Draw click event triggered by click instead of up 2013-02-06 15:06:50 -05:00
Tom MacWright
0d70e466de Add crazyegg, will remove at release 2013-02-06 14:37:04 -05:00
Ansis Brammanis
449c4d235d Add option to restore or reset unsaved changes 2013-02-06 14:03:31 -05:00
Ansis Brammanis
a21da4f15f Saving graph to and reinstating from localStorage 2013-02-06 12:48:42 -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
John Firebaugh
4dbd8f5efc Fix #634 2013-02-05 16:25:33 -08:00
John Firebaugh
8bee68dfbd Fix includes 2013-02-05 16:25:33 -08: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
Ansis Brammanis
14fc1d9c0d Fix flickering after redrawing active elems 2013-02-05 18:47:28 -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
John Firebaugh
13a784bea5 Better Way#asGeoJSON 2013-02-05 15:20:11 -08:00
John Firebaugh
8735413974 Relation#asGeoJSON 2013-02-05 15:20:11 -08:00
John Firebaugh
72cd6b91fa Relation#multipolygon returns coordinate arrays 2013-02-05 15:20:11 -08:00
Tom MacWright
356fd6edd5 Back off on replacing the location to 1/5 of previous throttle 2013-02-05 17:59:26 -05:00
Tom MacWright
f12b7d0fca Console... 2013-02-05 17:52:42 -05:00
Tom MacWright
930ed89229 Don't trim the cache. Should be fine. Probably. 2013-02-05 17:49:45 -05:00
Tom MacWright
3d13e25d41 Merge pull request #639 from systemed/faux-click
Faux click
2013-02-05 13:02:07 -08:00
Tom MacWright
4b76b136fa Fix tests for faux click 2013-02-05 15:58:54 -05:00
Tom MacWright
4a024651b4 Allow long clicks 2013-02-05 15:44:50 -05:00
Tom MacWright
9743fdf477 Up the radius tolerance to 12px 2013-02-05 15:41:56 -05:00