Commit Graph

1036 Commits

Author SHA1 Message Date
Tom MacWright 27e7df888d Support locales in taginfo. Fixes #678 2013-02-07 18:24:01 -05:00
Tom MacWright 645dcebbfe Use platform-specific mod keys, refs #676 2013-02-07 18:09:28 -05:00
Tom MacWright adbcfbd969 Merge branch 'master' of github.com:systemed/iD 2013-02-07 17:59:42 -05:00
Tom MacWright ad5c1df228 Detect support as well as os and language 2013-02-07 17:59:31 -05:00
Ansis Brammanis 28c541067b Fix #680, fix use of imagery scaleExtents 2013-02-07 17:58:28 -05:00
Ansis Brammanis ec065dca4c Fix flashing, reset transform on mouseup 2013-02-07 17:18:44 -05:00
Tom MacWright 57493016b6 Remove ref to 404 test, do not discard tags from empty tags 2013-02-07 17:17:24 -05:00
Tom MacWright 5e328435e6 jshint 2013-02-07 16:58:38 -05:00
Tom MacWright bae78aecba Merge pull request #675 from systemed/discard-tags
Discard tags
2013-02-07 13:55:43 -08:00
Tom MacWright a8f5ab206e Merge branch 'master' into discard-tags
Inline discardTags

Conflicts:
	index.html
2013-02-07 16:51:38 -05:00
John Firebaugh e1bc78871b Handle entities that are already deleted (fixes #672) 2013-02-07 13:46:25 -08:00
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 843926009d Normalize coordinates so that lasso can be dragged in any direction 2013-02-07 16:32:03 -05:00
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
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 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
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
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
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