Commit Graph

234 Commits

Author SHA1 Message Date
Tom MacWright 3449a680a7 Add tag deprecation action and data, not yet integrated. 2013-02-04 16:02:34 -05:00
Dr Ian 90aa734f53 Merge remote branch 'upstream/master' 2013-02-03 07:40:07 +01: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 8b6bb964ad Added orthogonalize function (square corners) 2013-02-02 23:52:16 +01:00
John Firebaugh f5036db978 Start iD.operations.Merge (#435)
It's currently limited to merging (joining) exactly two lines.

Fixes #370.
2013-02-01 17:32:33 -05:00
John Firebaugh a8410be6eb iD.actions.Join 2013-02-01 17:31:32 -05:00
John Firebaugh 9120f33aa7 ReverseWay -> Reverse 2013-02-01 17:31:32 -05:00
John Firebaugh c86792a77b SplitWay -> Split 2013-02-01 17:31:32 -05:00
John Firebaugh e1d5a0cb03 Unjoin -> Disconnect 2013-02-01 17:31:32 -05:00
John Firebaugh 58fcf746a2 Delete multiple 2013-02-01 15:08:41 -05:00
John Firebaugh 7ba31f05d2 Support deleting relations 2013-02-01 14:48:11 -05:00
Tom MacWright f1b6f5b14a Fix Google Analytics include 2013-02-01 12:47:57 -05:00
John Firebaugh a78aeeb625 Merge controller into iD 2013-02-01 12:40:15 -05:00
John Firebaugh 000ceb6467 iD.Context -> iD
All the UI setup code moved to iD.ui.
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
Saman Bemel-Benrud 5f8e7ec8cc Merge branch 'master' of github.com:systemed/iD 2013-01-31 19:20:32 -05:00
John Firebaugh bbccec75be Convert Hash to a behavior 2013-01-31 18:28:24 -05:00
John Firebaugh 7ea7326f92 Extract Select behavior 2013-01-31 15:56:24 -05:00
Saman Bemel-Benrud 116289ae53 minor fixes. 2013-01-31 15:54:14 -05:00
Tom MacWright 2613312d12 Add google analytics. 2013-01-31 13:30:54 -05:00
John Firebaugh 8bece3de15 Remove unused 2013-01-31 12:55:35 -05:00
John Firebaugh 15e1bee3ec Move controller 2013-01-31 12:45:39 -05:00
John Firebaugh 514ec1e28b Move validate 2013-01-31 12:44:11 -05:00
John Firebaugh 3605895dfa ChangeEntityTags -> ChangeTags 2013-01-31 12:41:29 -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
Tom MacWright 806ec9fae3 Add google analytics. 2013-01-31 11:39:51 -05:00
John Firebaugh 639f1b6977 Stub in splash screen (#567) 2013-01-30 16:44:27 -05:00
John Firebaugh e381b6ab26 Extract AddMidpoint action 2013-01-30 15:47:33 -05:00
John Firebaugh 6576ec6501 Operation sprites 2013-01-30 11:56:49 -05:00
Tom MacWright 4ed44ef9f0 Micro translation framework. 2013-01-29 18:34:40 -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
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 de7fad5803 Move remaining XML stuff to Connection 2013-01-27 21:50:08 -05:00
Tom MacWright 1f3319f7b0 Add circularize action. Fixes #491 2013-01-24 22:52:19 -05:00
John Firebaugh dd03544a00 Extract AddWay behavior 2013-01-24 18:04:40 -05:00
John Firebaugh 18c7267010 Extract Draw behavior
Fixed some bugs but introduced others.
2013-01-24 17:00:48 -05:00
Tom MacWright ce78e34b34 Merge, rename to radial menu and remove pi 2013-01-24 13:11:52 -05:00
Tom MacWright 2b4b8cb5fe Merge pull request #468 from systemed/labels
Labels
2013-01-23 16:21:01 -08:00
Tom MacWright 8741e69c10 Add source switch 2013-01-23 17:19:19 -05:00
Ansis Brammanis c337182791 Merge remote-tracking branch 'systemed/master' into labels 2013-01-23 17:00:30 -05:00
Tom MacWright 1a916ff506 Move keys to separate file, not working on osm.org yet. 2013-01-23 16:56:48 -05:00
Ansis Brammanis 3a48016e5f Merge remote-tracking branch 'systemed/master' into labels
Conflicts:
	js/id/util.js
2013-01-23 16:15:29 -05:00
John Firebaugh d6d1709e7b Trying out radial menus for operations UI (#226) 2013-01-23 15:34:04 -05:00
John Firebaugh 292c916cb1 Converting some actions to entity methods
The guidelines here are:

Entity methods:
  return a modified entity
  don't necessarily maintain whole-graph consistency

Actions:
  return a modified graph
  always maintain whole-graph consistency
  call entity methods liberally
  generally don't call other actions
2013-01-23 12:40:27 -05:00
John Firebaugh 6f0b715c9f Include new file 2013-01-23 10:35:01 -05:00
Ansis Brammanis 0afb564435 Merge remote-tracking branch 'systemed/master' into labels
Conflicts:
	js/id/svg/lines.js
	js/id/svg/surface.js
2013-01-20 20:37:00 -05:00
John Firebaugh 2ee07a3b74 Add iD.actions.AddRelationMember 2013-01-18 14:44:29 -08:00
Ansis Brammanis efd829e396 Merge branch 'master' into labels
Conflicts:
	js/id/renderer/map.js
	js/id/svg/lines.js
2013-01-18 17:19:12 -05:00