550 Commits

Author SHA1 Message Date
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 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
Tom MacWright 8f2157425c Merge branch 'master' into dynamic-layers 2013-02-05 12:03:27 -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
John Firebaugh c9fb1444db Connect via drag and drop
Fixes #598.
2013-02-04 16:48:54 -08:00
Tom MacWright 4d0a42344d Start dynamic layers work in branch 2013-02-04 19:47:25 -05:00
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
Tom MacWright eb999c47c6 Switch to comboboxes 2013-02-01 17:54:55 -05: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
Tom MacWright 72536229c7 Merge branch 'master' into presets
Conflicts:
	test/index.html
2013-02-01 12:03:40 -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
Tom MacWright 9f37249393 Merge branch 'master' into presets 2013-01-31 17:20:15 -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 ecb27eaf2f Merge branch 'master' into presets
Conflicts:
	js/id/modes/select.js
2013-01-31 15:14:28 -05:00
Tom MacWright 5bd95f6e6a Grab favorites, display them.
Show stuff nested in optional tags.
Fixes #582
2013-01-31 14:59:59 -05:00
Tom MacWright c871361bad Add preset search. 2013-01-31 13:50:19 -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
Tom MacWright 4e7ed7250b Add josm converter and converted, switch to it. 2013-01-31 12:18:06 -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
Tom MacWright bc59070ff3 Merge branch 'master' into presets
Conflicts:
	js/id/util.js
2013-01-31 11:35:29 -05:00
Tom MacWright e63434f437 Rename, titles, edit distance 2013-01-30 17:41:06 -05:00
Tom MacWright 2cb3e5849d First shot at presets
This includes a first JSON scheme and a bad-looking UI currently in
inspector.
2013-01-30 17:30:04 -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