Commit Graph

1305 Commits

Author SHA1 Message Date
John Firebaugh 73098d259e Specify type for relation member 2013-02-04 16:48:40 -08:00
Saman Bemel-Benrud 00da90cf36 Merge branch 'master' of github.com:systemed/iD 2013-02-04 19:37:31 -05:00
Saman Bemel-Benrud 5764012b23 better styles for map features. 2013-02-04 19:37:10 -05:00
Ansis Brammanis ab7c1fa80a Fix midpoint hiding. really 2013-02-04 18:32:16 -05:00
Ansis Brammanis c8ab057f19 Remove unused midpoint code 2013-02-04 18:26:45 -05:00
Ansis Brammanis d5937907a4 Hide midpoints without breaking drawing
I always forget d3 works this way.
2013-02-04 17:39:16 -05:00
Ansis Brammanis 7e997af9b8 Hide midpoints when vertices hidden 2013-02-04 17:24:00 -05:00
Tom MacWright 7a50001120 Merge branch 'master' of github.com:systemed/iD 2013-02-04 17:20:34 -05:00
Tom MacWright 3e71dd56cd Wipe out some tags entirely, refs #585 2013-02-04 17:20:06 -05:00
Ansis Brammanis 3417a1639c Hide midpoints when drawing (no snapping) 2013-02-04 17:16:14 -05:00
Ansis Brammanis 1b70a68214 Revert "Don't snap to midpoints, snap to their parent way"
This reverts commit 13b0b540a7.

Conflicts:

	js/id/behavior/draw_way.js
2013-02-04 17:14:56 -05:00
Ansis Brammanis d0d1a16c0a Fix label halo sizing 2013-02-04 17:04:33 -05:00
Tom MacWright b7cfaf08da userDetails should handle errors properly 2013-02-04 16:48:44 -05:00
Tom MacWright e5807e906d Merge branch 'master' of github.com:systemed/iD 2013-02-04 16:45:25 -05:00
Tom MacWright bd7f302730 Show deprecated tags in save commit, validate them, add deprecatedTags
to entity type.
2013-02-04 16:45:18 -05:00
Ansis Brammanis d756e3c2a2 Let ways be self-intersected 2013-02-04 16:30:19 -05:00
Tom MacWright 3d8f2ffb84 Consistify syntax 2013-02-04 16:08:34 -05:00
Tom MacWright 32bff58eae Merge branch 'master' of github.com:systemed/iD 2013-02-04 16:02:40 -05:00
Tom MacWright 3449a680a7 Add tag deprecation action and data, not yet integrated. 2013-02-04 16:02:34 -05:00
Ansis Brammanis 83e241083d Remove event 2013-02-04 15:30:59 -05:00
John Firebaugh 6dd1bebe89 Fix drawing in Firefox (fixes #628) 2013-02-04 12:26:57 -08:00
John Firebaugh 7ddfcaed39 i18n 2013-02-04 12:08:30 -08:00
John Firebaugh 0450e57acf Layers -> Background (#525) 2013-02-04 12:05:55 -08:00
Tom MacWright 6e74456b31 Fix dragging around resized edges. Fixes #552 2013-02-04 14:57:43 -05:00
John Firebaugh c2ddf67cc0 Show appropriate tooltips for disabled undo/redo buttons
Implementing this cross-browser requires using a `.disabled`
class rather than the `disabled` property. No browsers except
Opera dispatch mouse events on disabled buttons.

Fixes #620.
2013-02-04 11:25:20 -08:00
Ansis Brammanis e4a8fbd0f6 Eliminate flickering 2013-02-04 13:34:14 -05:00
Ansis Brammanis 4bfc91cc85 Fix dragging cursor off of edge while drawing 2013-02-04 12:34:11 -05:00
Tom MacWright 8d90fb777b Purge a few more uses of d3.select, refs #595 2013-02-04 12:32:14 -05:00
Tom MacWright a7d7a2e3da Merge branch 'master' of github.com:systemed/iD 2013-02-04 12:25:52 -05:00
Tom MacWright 4ee620cb09 Namespace selectors to iD-owned elements 2013-02-04 12:23:46 -05:00
John Firebaugh 8699b4a49e Adjust for style, formatting, and jshint 2013-02-04 09:18:15 -08:00
John Firebaugh 50de4155f4 Merge pull request #612 from porjo/master
Added orthogonalize function
2013-02-04 09:14:49 -08:00
Tom MacWright e5ad28feb7 JShint fixups 2013-02-04 12:10:23 -05:00
Ansis Brammanis 240d83c1fd Fix #623, get enitity from current graph 2013-02-04 10:54:39 -05:00
Dr Ian b912097ee4 Tidy up: fix indents, spaces etc.
- Update orthogonalize to match new circularize.
- Add orthoganalize to test index.html
- Revert whitespace on index.html
2013-02-03 20:12:04 +01:00
John Firebaugh 3000bc89ce shadow should be above fill
Makes it much easier to select lines that are within areas.
2013-02-03 08:49:43 -08:00
Dr Ian 90aa734f53 Merge remote branch 'upstream/master' 2013-02-03 07:40:07 +01:00
Ansis Brammanis 13b0b540a7 Don't snap to midpoints, snap to their parent way 2013-02-02 23:47:29 -05:00
John Firebaugh 441be74539 Simplify 2013-02-02 21:28:56 -05:00
John Firebaugh 33f5db4d96 Fix hash with selected id 2013-02-02 21:17:43 -05:00
John Firebaugh 0b3e0fb3db Use iD.actions.DeleteNode when removing nodes
They need to be removed from any parent relations.
Also, make sure to uniq child nodes, otherwise the
start/end node over-contributes to the centroid
calculation.

This action needs tests.
2013-02-02 21:17:10 -05:00
John Firebaugh 9e878b1cf9 Remove redundant conditional 2013-02-02 20:00:05 -05:00
John Firebaugh b08722fd3f Pass just the projection to Circularize 2013-02-02 19:59:05 -05:00
John Firebaugh 80a5a083b0 Remove unused 2013-02-02 19:57:36 -05:00
John Firebaugh ec602a7db7 Hook up connection and history in context 2013-02-02 19:47:56 -05:00
John Firebaugh fc00f154a9 Dispatch a change event on merge 2013-02-02 19:47:56 -05:00
John Firebaugh 1de05b518d Select result when splitting or joining ways
Fixes #601.
Fixes #603.
2013-02-02 19:47:56 -05:00
John Firebaugh 11d723819d Difference#extantIDs 2013-02-02 19:47:56 -05:00
John Firebaugh ddc5e324f6 Extract iD.Difference
iD.Difference represents the difference between two graphs.
It knows how to calculate the set of entities that were
created, modified, or deleted, and also contains the logic
for recursively extending a difference to the complete set
of entities that will require a redraw, taking into account
child and parent relationships.

Additionally, all history mutators now return a difference.
2013-02-02 19:47:56 -05:00
Dr Ian 26b8b8789e Fix case where parentnodes present 2013-02-03 00:05:11 +01:00