Commit Graph

328 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
8bee68dfbd Fix includes 2013-02-05 16:25:33 -08: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
4b76b136fa Fix tests for faux click 2013-02-05 15:58:54 -05:00
Tom MacWright
d159b37ab6 Fix tests 2013-02-05 12:10:05 -05:00
Ansis Brammanis
d3d0851596 Fix svg/midpoint tests
Proper solution waiting on 369
2013-02-05 00:51:54 -05:00
John Firebaugh
c9fb1444db Connect via drag and drop
Fixes #598.
2013-02-04 16:48:54 -08:00
John Firebaugh
73098d259e Specify type for relation member 2013-02-04 16:48:40 -08:00
Tom MacWright
3e71dd56cd Wipe out some tags entirely, refs #585 2013-02-04 17:20:06 -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
Tom MacWright
3449a680a7 Add tag deprecation action and data, not yet integrated. 2013-02-04 16:02:34 -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
80a5a083b0 Remove unused 2013-02-02 19:57:36 -05:00
John Firebaugh
fc00f154a9 Dispatch a change event on merge 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
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
20730e5f1a Entity#mergeTags 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
John Firebaugh
3da0e70c0f Shift-selection 2013-02-01 14:31:47 -05:00
Tom MacWright
031c8d655e Fallback for browsers that do not support localStorage. Fixes #591 2013-02-01 13:12:46 -05:00
John Firebaugh
fe49e8fb77 Pass around context rather than map 2013-02-01 12:40:16 -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
John Firebaugh
402a9424c0 Make selection an array of entity IDs
Should have no visible effect yet.
2013-01-31 13:51:12 -05:00
Ansis Brammanis
846cf6e43d Add difference tests 2013-01-31 13:37:54 -05:00
John Firebaugh
15e1bee3ec Move controller 2013-01-31 12:45:39 -05:00
John Firebaugh
3605895dfa ChangeEntityTags -> ChangeTags 2013-01-31 12:41:29 -05:00
John Firebaugh
df72ef254f ChangeEntityTags -> ChangeTags 2013-01-31 12:07:54 -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
John Firebaugh
208ed6a2ed Move iD.geo tests to own file 2013-01-31 08:30:46 -05:00
John Firebaugh
6ae360a533 These tests now pass 2013-01-31 08:28:10 -05:00
Ansis Brammanis
b73d18cbf5 Merge remote-tracking branch 'systemed/master' into graph-perf2 2013-01-30 16:58:44 -05:00
John Firebaugh
639f1b6977 Stub in splash screen (#567) 2013-01-30 16:44:27 -05:00
Ansis Brammanis
a82b81a3c2 Add tests for #replace #remove #rebase 2013-01-30 16:40:00 -05:00
John Firebaugh
e381b6ab26 Extract AddMidpoint action 2013-01-30 15:47:33 -05:00